From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, Dave Chinner <david@fromorbit.com>
Subject: Re: [PATCH 03/14] xfs: simplify the xfs_log_release_iclog calling convention
Date: Tue, 17 Mar 2020 09:23:59 -0400 [thread overview]
Message-ID: <20200317132359.GD24078@bfoster> (raw)
In-Reply-To: <20200316144233.900390-4-hch@lst.de>
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@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> 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
>
next prev parent reply other threads:[~2020-03-17 13:24 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 14:42 cleanup log I/O error handling v2 Christoph Hellwig
2020-03-16 14:42 ` [PATCH 01/14] xfs: merge xlog_cil_push into xlog_cil_push_work Christoph Hellwig
2020-03-16 19:40 ` Darrick J. Wong
2020-03-17 0:15 ` Dave Chinner
2020-03-17 13:23 ` Brian Foster
2020-03-16 14:42 ` [PATCH 02/14] xfs: factor out a xlog_wait_on_iclog helper Christoph Hellwig
2020-03-16 20:20 ` Darrick J. Wong
2020-03-17 13:23 ` Brian Foster
2020-03-16 14:42 ` [PATCH 03/14] xfs: simplify the xfs_log_release_iclog calling convention Christoph Hellwig
2020-03-16 20:21 ` Darrick J. Wong
2020-03-17 13:23 ` Brian Foster [this message]
2020-03-16 14:42 ` [PATCH 04/14] xfs: simplify log shutdown checking in xfs_log_release_iclog Christoph Hellwig
2020-03-16 20:33 ` Darrick J. Wong
2020-03-17 13:24 ` Brian Foster
2020-03-16 14:42 ` [PATCH 05/14] xfs: remove the aborted parameter to xlog_state_done_syncing Christoph Hellwig
2020-03-16 20:50 ` Darrick J. Wong
2020-03-18 9:38 ` Christoph Hellwig
2020-03-17 13:24 ` Brian Foster
2020-03-16 14:42 ` [PATCH 06/14] xfs: refactor xlog_state_clean_iclog Christoph Hellwig
2020-03-16 20:59 ` Darrick J. Wong
2020-03-17 13:25 ` Brian Foster
2020-03-18 9:40 ` Christoph Hellwig
2020-03-16 14:42 ` [PATCH 07/14] xfs: move the ioerror check out of xlog_state_clean_iclog Christoph Hellwig
2020-03-16 21:00 ` Darrick J. Wong
2020-03-17 13:25 ` Brian Foster
2020-03-16 14:42 ` [PATCH 08/14] xfs: move xlog_state_do_iclog_callbacks up Christoph Hellwig
2020-03-16 21:00 ` Darrick J. Wong
2020-03-18 14:44 ` Brian Foster
2020-03-16 14:42 ` [PATCH 09/14] xfs: move log shut down handling out of xlog_state_iodone_process_iclog Christoph Hellwig
2020-03-16 21:02 ` Darrick J. Wong
2020-03-18 14:48 ` Brian Foster
2020-03-18 16:34 ` Christoph Hellwig
2020-03-19 11:36 ` Brian Foster
2020-03-19 13:05 ` Christoph Hellwig
2020-03-19 13:37 ` Brian Foster
2020-03-16 14:42 ` [PATCH 10/14] xfs: refactor xlog_state_iodone_process_iclog Christoph Hellwig
2020-03-16 21:07 ` Darrick J. Wong
2020-03-16 14:42 ` [PATCH 11/14] xfs: merge xlog_state_clean_iclog into xlog_state_iodone_process_iclog Christoph Hellwig
2020-03-16 21:09 ` Darrick J. Wong
2020-03-18 14:48 ` Brian Foster
2020-03-16 14:42 ` [PATCH 12/14] xfs: merge xlog_state_set_callback " Christoph Hellwig
2020-03-16 21:10 ` Darrick J. Wong
2020-03-18 14:48 ` Brian Foster
2020-03-16 14:42 ` [PATCH 13/14] xfs: remove xlog_state_want_sync Christoph Hellwig
2020-03-16 21:23 ` Darrick J. Wong
2020-03-18 14:48 ` Brian Foster
2020-03-16 14:42 ` [PATCH 14/14] xfs: remove XLOG_STATE_IOERROR Christoph Hellwig
2020-03-16 21:25 ` Darrick J. Wong
2020-03-18 9:43 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200317132359.GD24078@bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).