On Mon, Mar 16, 2020 at 03:42:22PM +0100, Christoph Hellwig wrote:
> 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@xxxxxx>
Heh.
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_log.c | 10 ++++------
> fs/xfs/xfs_log.h | 3 +--
> fs/xfs/xfs_log_cil.c | 2 +-
> 3 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 955df2902c2c..17ba92b115ea 100644
> --- 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 84e06805160f..b38602216c5a 100644
> --- 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 6a6278b8eb2d..047ac253edfe 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -866,7 +866,7 @@ xlog_cil_push_work(
> 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:
> --
> 2.24.1
>
