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@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
>
> --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
> >
>
