xfs: simplify the xfs_log_release_iclog calling convention

The only caller of xfs_log_release_iclog doesn't care about the return
value, so remove it.  Also don't bother passing the mount pointer,
given that we can trivially derive it from the iclog.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 955df2902c2c1c72cd444b858ad05dcaebf6f0dc..17ba92b115eab862044f5278143cb467b395ca38 100644 (file)
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -597,12 +597,11 @@ xlog_state_release_iclog(
        return 0;
 }
 
-int
+void
 xfs_log_release_iclog(
-       struct xfs_mount        *mp,
        struct xlog_in_core     *iclog)
 {
-       struct xlog             *log = mp->m_log;
+       struct xlog             *log = iclog->ic_log;
        bool                    sync;
 
        if (iclog->ic_state == XLOG_STATE_IOERROR)
@@ -618,10 +617,9 @@ xfs_log_release_iclog(
                if (sync)
                        xlog_sync(log, iclog);
        }
-       return 0;
+       return;
 error:
-       xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);
-       return -EIO;
+       xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
 }
 
 /*

diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index 84e06805160f88d6d490153b3138e31a0c5e91b8..b38602216c5af7578e99d34dad9f6e42848700ca 100644 (file)
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -121,8 +121,7 @@ void        xfs_log_mount_cancel(struct xfs_mount *);
 xfs_lsn_t xlog_assign_tail_lsn(struct xfs_mount *mp);
 xfs_lsn_t xlog_assign_tail_lsn_locked(struct xfs_mount *mp);
 void     xfs_log_space_wake(struct xfs_mount *mp);
-int      xfs_log_release_iclog(struct xfs_mount *mp,
-                        struct xlog_in_core     *iclog);
+void     xfs_log_release_iclog(struct xlog_in_core *iclog);
 int      xfs_log_reserve(struct xfs_mount *mp,
                          int              length,
                          int              count,

diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 9ef0f8b555a4297c0d8e9cd5364c9fe6ad320147..278166811c8054f92a2b9a357582a7ad20701608 100644 (file)
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -866,7 +866,7 @@ restart:
        spin_unlock(&cil->xc_push_lock);
 
        /* release the hounds! */
-       xfs_log_release_iclog(log->l_mp, commit_iclog);
+       xfs_log_release_iclog(commit_iclog);
        return;
 
 out_skip: