xfs: move xlog_commit_record to xfs_log_cil.c

It is only used by the CIL checkpoints, and is the counterpart to
start record formatting and writing that is already local to
xfs_log_cil.c.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index a26c7909cbe7ef82497c7f60d045a648ae14a04f..fbcf70f7804bd5857cacdf49b7b1b189c8b7b3c9 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1658,37 +1658,6 @@ out:
        return ERR_PTR(error);
 }      /* xlog_alloc_log */
 
-/*
- * Write out the commit record of a transaction associated with the given
- * ticket to close off a running log write. Return the lsn of the commit record.
- */
-int
-xlog_commit_record(
-       struct xlog             *log,
-       struct xlog_ticket      *ticket,
-       struct xlog_in_core     **iclog,
-       xfs_lsn_t               *lsn)
-{
-       struct xfs_log_iovec reg = {
-               .i_addr = NULL,
-               .i_len = 0,
-               .i_type = XLOG_REG_TYPE_COMMIT,
-       };
-       struct xfs_log_vec vec = {
-               .lv_niovecs = 1,
-               .lv_iovecp = &reg,
-       };
-       int     error;
-
-       if (xlog_is_shutdown(log))
-               return -EIO;
-
-       error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS);
-       if (error)
-               xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
-       return error;
-}
-
 /*
  * Compute the LSN that we'd need to push the log tail towards in order to have
  * (a) enough on-disk log space to log the number of bytes specified, (b) at

diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index e18b539d26fb895835d971cb417198f39abc3005..5ebb5737d73fd664c33c3b8465f7d9768999ccce 100644 (file)
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -631,6 +631,38 @@ xlog_cil_process_committed(
        }
 }
 
+/*
+ * Write out the commit record of a checkpoint transaction associated with the
+ * given ticket to close off a running log write. Return the lsn of the commit
+ * record.
+ */
+static int
+xlog_cil_write_commit_record(
+       struct xlog             *log,
+       struct xlog_ticket      *ticket,
+       struct xlog_in_core     **iclog,
+       xfs_lsn_t               *lsn)
+{
+       struct xfs_log_iovec reg = {
+               .i_addr = NULL,
+               .i_len = 0,
+               .i_type = XLOG_REG_TYPE_COMMIT,
+       };
+       struct xfs_log_vec vec = {
+               .lv_niovecs = 1,
+               .lv_iovecp = &reg,
+       };
+       int     error;
+
+       if (xlog_is_shutdown(log))
+               return -EIO;
+
+       error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS);
+       if (error)
+               xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
+       return error;
+}
+
 /*
  * Push the Committed Item List to the log.
  *
@@ -884,7 +916,8 @@ restart:
        }
        spin_unlock(&cil->xc_push_lock);
 
-       error = xlog_commit_record(log, tic, &commit_iclog, &commit_lsn);
+       error = xlog_cil_write_commit_record(log, tic, &commit_iclog,
+                       &commit_lsn);
        if (error)
                goto out_abort_free_ticket;
 

diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 86ddd0f9cecf7eda7e851ffc4614ce84fa01981e..951447fc04146f7bf9d2da86b2f655115c397038 100644 (file)
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -515,8 +515,6 @@ void        xlog_print_trans(struct xfs_trans *);
 int    xlog_write(struct xlog *log, struct xfs_log_vec *log_vector,
                struct xlog_ticket *tic, xfs_lsn_t *start_lsn,
                struct xlog_in_core **commit_iclog, uint optype);
-int    xlog_commit_record(struct xlog *log, struct xlog_ticket *ticket,
-               struct xlog_in_core **iclog, xfs_lsn_t *lsn);
 void   xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);
 void   xfs_log_ticket_regrant(struct xlog *log, struct xlog_ticket *ticket);