xfs: xlog_write() doesn't need optype anymore

So remove it from the interface and callers.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 13273a906f1b5cf1a915303a186214f9765bbadd..c3fb2b0b40d31f256873b55717192900856a57ad 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -952,8 +952,7 @@ xlog_write_unmount_record(
        /* account for space used by record data */
        ticket->t_curr_res -= sizeof(unmount_rec);
 
-       return xlog_write(log, NULL, &vec, ticket, XLOG_UNMOUNT_TRANS,
-                       reg.i_len);
+       return xlog_write(log, NULL, &vec, ticket, reg.i_len);
 }
 
 /*
@@ -2469,7 +2468,6 @@ xlog_write(
        struct xfs_cil_ctx      *ctx,
        struct xfs_log_vec      *log_vector,
        struct xlog_ticket      *ticket,
-       uint                    optype,
        uint32_t                len)
 
 {

diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index dad2b527c3ff065c96ab42d809b2ed1174761774..9065250227f91bfd24c606b2f8752a39bb9861c1 100644 (file)
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -834,8 +834,7 @@ xlog_cil_write_chain(
        error = xlog_cil_order_write(ctx->cil, ctx->sequence, _START_RECORD);
        if (error)
                return error;
-       return xlog_write(log, ctx, chain, ctx->ticket, XLOG_START_TRANS,
-                       chain_len);
+       return xlog_write(log, ctx, chain, ctx->ticket, chain_len);
 }
 
 /*
@@ -874,8 +873,7 @@ xlog_cil_write_commit_record(
 
        /* account for space used by record data */
        ctx->ticket->t_curr_res -= reg.i_len;
-       error = xlog_write(log, ctx, &vec, ctx->ticket, XLOG_COMMIT_TRANS,
-                       reg.i_len);
+       error = xlog_write(log, ctx, &vec, ctx->ticket, reg.i_len);
        if (error)
                xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
        return error;

diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 2fbec7a30e590a0103a1ef7c1e6d38cfc78683d5..b3d5ee85dd7e858da3c9d760afe44b10020c9c72 100644 (file)
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -491,7 +491,7 @@ void        xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket);
 void   xlog_print_trans(struct xfs_trans *);
 int    xlog_write(struct xlog *log, struct xfs_cil_ctx *ctx,
                struct xfs_log_vec *log_vector, struct xlog_ticket *tic,
-               uint optype, uint32_t len);
+               uint32_t len);
 void   xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);
 void   xfs_log_ticket_regrant(struct xlog *log, struct xlog_ticket *ticket);