From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Brian Foster <bfoster@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v3 12/17] xfs: drop unused shutdown parameter from xfs_trans_ail_remove()
Date: Thu, 30 Apr 2020 11:56:46 -0700 [thread overview]
Message-ID: <20200430185646.GM6742@magnolia> (raw)
In-Reply-To: <20200429172153.41680-13-bfoster@redhat.com>
On Wed, Apr 29, 2020 at 01:21:48PM -0400, Brian Foster wrote:
> The shutdown parameter of xfs_trans_ail_remove() is no longer used.
> The remaining callers use it for items that legitimately might not
> be in the AIL or from contexts where AIL state has already been
> checked. Remove the unnecessary parameter and fix up the callers.
>
> Signed-off-by: Brian Foster <bfoster@redhat.com>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_buf_item.c | 2 +-
> fs/xfs/xfs_dquot.c | 2 +-
> fs/xfs/xfs_dquot_item.c | 2 +-
> fs/xfs/xfs_inode_item.c | 6 +-----
> fs/xfs/xfs_trans_priv.h | 3 +--
> 5 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 06e306b49283..47c547aca1f1 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -558,7 +558,7 @@ xfs_buf_item_put(
> * state.
> */
> if (aborted)
> - xfs_trans_ail_remove(lip, SHUTDOWN_LOG_IO_ERROR);
> + xfs_trans_ail_remove(lip);
> xfs_buf_item_relse(bip->bli_buf);
> return true;
> }
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 5fb65f43b980..497a9dbef1c9 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -1162,7 +1162,7 @@ xfs_qm_dqflush(
>
> out_abort:
> dqp->dq_flags &= ~XFS_DQ_DIRTY;
> - xfs_trans_ail_remove(lip, SHUTDOWN_CORRUPT_INCORE);
> + xfs_trans_ail_remove(lip);
> xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> out_unlock:
> xfs_dqfunlock(dqp);
> diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
> index 5a7808299a32..8bd46810d5db 100644
> --- a/fs/xfs/xfs_dquot_item.c
> +++ b/fs/xfs/xfs_dquot_item.c
> @@ -343,7 +343,7 @@ xfs_qm_qoff_logitem_relse(
> ASSERT(test_bit(XFS_LI_IN_AIL, &lip->li_flags) ||
> test_bit(XFS_LI_ABORTED, &lip->li_flags) ||
> XFS_FORCED_SHUTDOWN(lip->li_mountp));
> - xfs_trans_ail_remove(lip, SHUTDOWN_LOG_IO_ERROR);
> + xfs_trans_ail_remove(lip);
> kmem_free(lip->li_lv_shadow);
> kmem_free(qoff);
> }
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index 1d4d256a2e96..0e449d0a3d5c 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -768,11 +768,7 @@ xfs_iflush_abort(
> xfs_inode_log_item_t *iip = ip->i_itemp;
>
> if (iip) {
> - if (test_bit(XFS_LI_IN_AIL, &iip->ili_item.li_flags)) {
> - xfs_trans_ail_remove(&iip->ili_item,
> - stale ? SHUTDOWN_LOG_IO_ERROR :
> - SHUTDOWN_CORRUPT_INCORE);
> - }
> + xfs_trans_ail_remove(&iip->ili_item);
> iip->ili_logged = 0;
> /*
> * Clear the ili_last_fields bits now that we know that the
> diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h
> index e4362fb8d483..ab0a82e90825 100644
> --- a/fs/xfs/xfs_trans_priv.h
> +++ b/fs/xfs/xfs_trans_priv.h
> @@ -98,8 +98,7 @@ void xfs_trans_ail_delete(struct xfs_log_item *lip, int shutdown_type);
>
> static inline void
> xfs_trans_ail_remove(
> - struct xfs_log_item *lip,
> - int shutdown_type)
> + struct xfs_log_item *lip)
> {
> struct xfs_ail *ailp = lip->li_ailp;
> xfs_lsn_t tail_lsn;
> --
> 2.21.1
>
next prev parent reply other threads:[~2020-04-30 18:56 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 17:21 [PATCH v3 00/17] xfs: flush related error handling cleanups Brian Foster
2020-04-29 17:21 ` [PATCH v3 01/17] xfs: refactor failed buffer resubmission into xfsaild Brian Foster
2020-04-30 17:26 ` Darrick J. Wong
2020-04-29 17:21 ` [PATCH v3 02/17] xfs: factor out buffer I/O failure code Brian Foster
2020-04-30 18:16 ` Darrick J. Wong
2020-05-01 7:43 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 03/17] xfs: simplify inode flush error handling Brian Foster
2020-04-30 18:37 ` Darrick J. Wong
2020-05-01 9:17 ` Christoph Hellwig
2020-05-01 10:17 ` Christoph Hellwig
2020-05-01 17:43 ` Darrick J. Wong
2020-05-01 17:50 ` Christoph Hellwig
2020-05-01 11:22 ` Brian Foster
2020-04-29 17:21 ` [PATCH v3 04/17] xfs: remove unnecessary shutdown check from xfs_iflush() Brian Foster
2020-04-30 18:37 ` Darrick J. Wong
2020-04-29 17:21 ` [PATCH v3 05/17] xfs: reset buffer write failure state on successful completion Brian Foster
2020-04-30 18:41 ` Darrick J. Wong
2020-05-01 7:44 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 06/17] xfs: refactor ratelimited buffer error messages into helper Brian Foster
2020-04-30 18:42 ` Darrick J. Wong
2020-05-01 7:44 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 07/17] xfs: ratelimit unmount time per-buffer I/O error alert Brian Foster
2020-04-30 18:43 ` Darrick J. Wong
2020-04-30 22:07 ` Dave Chinner
2020-05-01 11:24 ` Brian Foster
2020-05-01 7:48 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 08/17] xfs: fix duplicate verification from xfs_qm_dqflush() Brian Foster
2020-04-30 18:45 ` Darrick J. Wong
2020-05-01 11:24 ` Brian Foster
2020-04-29 17:21 ` [PATCH v3 09/17] xfs: abort consistently on dquot flush failure Brian Foster
2020-04-30 18:46 ` Darrick J. Wong
2020-04-29 17:21 ` [PATCH v3 10/17] xfs: acquire ->ail_lock from xfs_trans_ail_delete() Brian Foster
2020-04-30 18:52 ` Darrick J. Wong
2020-05-01 11:25 ` Brian Foster
2020-05-01 7:50 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 11/17] xfs: use delete helper for items expected to be in AIL Brian Foster
2020-04-30 18:54 ` Darrick J. Wong
2020-05-01 7:56 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 12/17] xfs: drop unused shutdown parameter from xfs_trans_ail_remove() Brian Foster
2020-04-30 18:56 ` Darrick J. Wong [this message]
2020-05-01 7:57 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 13/17] xfs: combine xfs_trans_ail_[remove|delete]() Brian Foster
2020-04-30 18:58 ` Darrick J. Wong
2020-05-01 8:01 ` Christoph Hellwig
2020-05-01 8:00 ` Christoph Hellwig
2020-05-01 11:25 ` Brian Foster
2020-04-29 17:21 ` [PATCH v3 14/17] xfs: remove unused iflush stale parameter Brian Foster
2020-04-30 18:58 ` Darrick J. Wong
2020-04-29 17:21 ` [PATCH v3 15/17] xfs: random buffer write failure errortag Brian Foster
2020-04-30 18:59 ` Darrick J. Wong
2020-05-01 8:02 ` Christoph Hellwig
2020-04-29 17:21 ` [PATCH v3 16/17] xfs: remove unused shutdown types Brian Foster
2020-04-30 18:59 ` Darrick J. Wong
2020-04-29 17:21 ` [PATCH v3 17/17] xfs: remove unused iget_flags param from xfs_imap_to_bp() Brian Foster
2020-04-30 19:00 ` Darrick J. Wong
2020-05-01 8:03 ` Christoph Hellwig
2020-05-01 11:25 ` Brian Foster
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=20200430185646.GM6742@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--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).