From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v3 17/17] xfs: remove unused iget_flags param from xfs_imap_to_bp()
Date: Fri, 1 May 2020 07:25:41 -0400 [thread overview]
Message-ID: <20200501112541.GF40250@bfoster> (raw)
In-Reply-To: <20200430190057.GR6742@magnolia>
On Thu, Apr 30, 2020 at 12:00:57PM -0700, Darrick J. Wong wrote:
> On Wed, Apr 29, 2020 at 01:21:53PM -0400, Brian Foster wrote:
> > iget_flags is unused in xfs_imap_to_bp(). Remove the parameter and
> > fix up the callers.
> >
> > Signed-off-by: Brian Foster <bfoster@redhat.com>
>
> Not sure why this is in this series, but as a small cleanup it makes
> sense anyway...
>
I happened to notice it when experimenting with the patch that lifted
XFS_LI_FAILED outside of ->ail_lock, but that patch ended up removed.
Brian
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
>
> --D
>
> > ---
> > fs/xfs/libxfs/xfs_inode_buf.c | 5 ++---
> > fs/xfs/libxfs/xfs_inode_buf.h | 2 +-
> > fs/xfs/scrub/ialloc.c | 3 +--
> > fs/xfs/xfs_inode.c | 7 +++----
> > fs/xfs/xfs_log_recover.c | 2 +-
> > 5 files changed, 8 insertions(+), 11 deletions(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> > index b102e611bf54..81a010422bea 100644
> > --- a/fs/xfs/libxfs/xfs_inode_buf.c
> > +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> > @@ -161,8 +161,7 @@ xfs_imap_to_bp(
> > struct xfs_imap *imap,
> > struct xfs_dinode **dipp,
> > struct xfs_buf **bpp,
> > - uint buf_flags,
> > - uint iget_flags)
> > + uint buf_flags)
> > {
> > struct xfs_buf *bp;
> > int error;
> > @@ -621,7 +620,7 @@ xfs_iread(
> > /*
> > * Get pointers to the on-disk inode and the buffer containing it.
> > */
> > - error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0, iget_flags);
> > + error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0);
> > if (error)
> > return error;
> >
> > diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
> > index 9b373dcf9e34..d9b4781ac9fd 100644
> > --- a/fs/xfs/libxfs/xfs_inode_buf.h
> > +++ b/fs/xfs/libxfs/xfs_inode_buf.h
> > @@ -48,7 +48,7 @@ struct xfs_imap {
> >
> > int xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,
> > struct xfs_imap *, struct xfs_dinode **,
> > - struct xfs_buf **, uint, uint);
> > + struct xfs_buf **, uint);
> > int xfs_iread(struct xfs_mount *, struct xfs_trans *,
> > struct xfs_inode *, uint);
> > void xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);
> > diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
> > index 64c217eb06a7..6517d67e8d51 100644
> > --- a/fs/xfs/scrub/ialloc.c
> > +++ b/fs/xfs/scrub/ialloc.c
> > @@ -278,8 +278,7 @@ xchk_iallocbt_check_cluster(
> > &XFS_RMAP_OINFO_INODES);
> >
> > /* Grab the inode cluster buffer. */
> > - error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp,
> > - 0, 0);
> > + error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp, 0);
> > if (!xchk_btree_xref_process_error(bs->sc, bs->cur, 0, &error))
> > return error;
> >
> > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > index e0d9a5bf7507..4f915b91b9fd 100644
> > --- a/fs/xfs/xfs_inode.c
> > +++ b/fs/xfs/xfs_inode.c
> > @@ -2172,7 +2172,7 @@ xfs_iunlink_update_inode(
> >
> > ASSERT(xfs_verify_agino_or_null(mp, agno, next_agino));
> >
> > - error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0, 0);
> > + error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &ibp, 0);
> > if (error)
> > return error;
> >
> > @@ -2302,7 +2302,7 @@ xfs_iunlink_map_ino(
> > return error;
> > }
> >
> > - error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0, 0);
> > + error = xfs_imap_to_bp(mp, tp, imap, dipp, bpp, 0);
> > if (error) {
> > xfs_warn(mp, "%s: xfs_imap_to_bp returned error %d.",
> > __func__, error);
> > @@ -3665,8 +3665,7 @@ xfs_iflush(
> > * If we get any other error, we effectively have a corruption situation
> > * and we cannot flush the inode. Abort the flush and shut down.
> > */
> > - error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK,
> > - 0);
> > + error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &bp, XBF_TRYLOCK);
> > if (error == -EAGAIN) {
> > xfs_ifunlock(ip);
> > return error;
> > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> > index 11c3502b07b1..6a98fd9f00b3 100644
> > --- a/fs/xfs/xfs_log_recover.c
> > +++ b/fs/xfs/xfs_log_recover.c
> > @@ -4987,7 +4987,7 @@ xlog_recover_process_one_iunlink(
> > /*
> > * Get the on disk inode to find the next inode in the bucket.
> > */
> > - error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0, 0);
> > + error = xfs_imap_to_bp(mp, NULL, &ip->i_imap, &dip, &ibp, 0);
> > if (error)
> > goto fail_iput;
> >
> > --
> > 2.21.1
> >
>
prev parent reply other threads:[~2020-05-01 11:25 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
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 [this message]
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=20200501112541.GF40250@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.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).