xfs: convert xfs_log_commit_cil() to void [Linux 3.15]

This Linux kernel change "xfs: convert xfs_log_commit_cil() to void" is included in the Linux 3.15 release. This change is authored by Jie Liu <jeff.liu [at] oracle.com> on Fri Feb 7 15:26:07 2014 +1100. The commit for this change in Linux stable tree is c6f9726 (patch).

xfs: convert xfs_log_commit_cil() to void

Convert xfs_log_commit_cil() to a void function since it return nothing
but 0 in any case, after that we can simplify the relative code logic
in xfs_trans_commit() accordingly.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

There are 17 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 fs/xfs/xfs_log.h     |  2 +-
 fs/xfs/xfs_log_cil.c |  3 +--
 fs/xfs/xfs_trans.c   | 12 ++----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index b0f4ef7..2c40044 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -175,7 +175,7 @@ int   xfs_log_reserve(struct xfs_mount *mp,
 struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);
 void     xfs_log_ticket_put(struct xlog_ticket *ticket);

-int    xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
+void   xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,
                xfs_lsn_t *commit_lsn, int flags);
 bool   xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);

diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index cdebd83..f034cbd 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -710,7 +710,7 @@
  * background commit, returns without it held once background commits are
  * allowed again.
  */
-int
+void
 xfs_log_commit_cil(
    struct xfs_mount    *mp,
    struct xfs_trans    *tp,
@@ -756,7 +756,6 @@
    xlog_cil_push_background(log);

    up_read(&cil->xc_ctx_lock);
-   return 0;
 }

 /*
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index c812c5c0..54a57326 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -887,12 +887,7 @@
        xfs_trans_apply_sb_deltas(tp);
    xfs_trans_apply_dquot_deltas(tp);

-   error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags);
-   if (error == ENOMEM) {
-       xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);
-       error = XFS_ERROR(EIO);
-       goto out_unreserve;
-   }
+   xfs_log_commit_cil(mp, tp, &commit_lsn, flags);

    current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
    xfs_trans_free(tp);
@@ -902,10 +897,7 @@
     * log out now and wait for it.
     */
    if (sync) {
-       if (!error) {
-           error = _xfs_log_force_lsn(mp, commit_lsn,
-                     XFS_LOG_SYNC, NULL);
-       }
+       error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);
        XFS_STATS_INC(xs_trans_sync);
    } else {
        XFS_STATS_INC(xs_trans_async);

Leave a Reply

Your email address will not be published. Required fields are marked *