Message ID | 20191116182214.23711-6-hch@lst.de (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | [1/9] xfs: simplify mappedbno case from xfs_da_get_buf and xfs_da_read_buf | expand |
On Sat, Nov 16, 2019 at 07:22:10PM +0100, Christoph Hellwig wrote: > This argument is always hard coded to -1, so remove it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_dir2_leaf.c | 9 ++++----- > fs/xfs/libxfs/xfs_dir2_priv.h | 4 ++-- > fs/xfs/scrub/dir.c | 2 +- > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c > index e2e4b2c6d6c2..2eee4e299e19 100644 > --- a/fs/xfs/libxfs/xfs_dir2_leaf.c > +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c > @@ -262,13 +262,12 @@ xfs_dir3_leaf_read( > struct xfs_trans *tp, > struct xfs_inode *dp, > xfs_dablk_t fbno, > - xfs_daddr_t mappedbno, > struct xfs_buf **bpp) > { > int err; > > - err = xfs_da_read_buf(tp, dp, fbno, mappedbno, bpp, > - XFS_DATA_FORK, &xfs_dir3_leaf1_buf_ops); > + err = xfs_da_read_buf(tp, dp, fbno, -1, bpp, XFS_DATA_FORK, > + &xfs_dir3_leaf1_buf_ops); > if (!err && tp && *bpp) > xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAF1_BUF); > return err; > @@ -639,7 +638,7 @@ xfs_dir2_leaf_addname( > > trace_xfs_dir2_leaf_addname(args); > > - error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); > + error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp); > if (error) > return error; > > @@ -1230,7 +1229,7 @@ xfs_dir2_leaf_lookup_int( > tp = args->trans; > mp = dp->i_mount; > > - error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); > + error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp); > if (error) > return error; > > diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h > index a730c5223c64..ade41556901a 100644 > --- a/fs/xfs/libxfs/xfs_dir2_priv.h > +++ b/fs/xfs/libxfs/xfs_dir2_priv.h > @@ -91,8 +91,8 @@ void xfs_dir2_leaf_hdr_from_disk(struct xfs_mount *mp, > struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from); > void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to, > struct xfs_dir3_icleaf_hdr *from); > -extern int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, > - xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp); > +int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, > + xfs_dablk_t fbno, struct xfs_buf **bpp); > extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp, > xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp); > extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args, > diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c > index 7983ea40668a..910e0bf85bd7 100644 > --- a/fs/xfs/scrub/dir.c > +++ b/fs/xfs/scrub/dir.c > @@ -497,7 +497,7 @@ xchk_directory_leaf1_bestfree( > int error; > > /* Read the free space block. */ > - error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, -1, &bp); > + error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, &bp); > if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, lblk, &error)) > goto out; > xchk_buffer_recheck(sc, bp); > -- > 2.20.1 >
On Sat, Nov 16, 2019 at 07:22:10PM +0100, Christoph Hellwig wrote: > This argument is always hard coded to -1, so remove it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_dir2_leaf.c | 9 ++++----- > fs/xfs/libxfs/xfs_dir2_priv.h | 4 ++-- > fs/xfs/scrub/dir.c | 2 +- > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c > index e2e4b2c6d6c2..2eee4e299e19 100644 > --- a/fs/xfs/libxfs/xfs_dir2_leaf.c > +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c > @@ -262,13 +262,12 @@ xfs_dir3_leaf_read( > struct xfs_trans *tp, > struct xfs_inode *dp, > xfs_dablk_t fbno, > - xfs_daddr_t mappedbno, > struct xfs_buf **bpp) > { > int err; > > - err = xfs_da_read_buf(tp, dp, fbno, mappedbno, bpp, > - XFS_DATA_FORK, &xfs_dir3_leaf1_buf_ops); > + err = xfs_da_read_buf(tp, dp, fbno, -1, bpp, XFS_DATA_FORK, > + &xfs_dir3_leaf1_buf_ops); > if (!err && tp && *bpp) > xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAF1_BUF); > return err; > @@ -639,7 +638,7 @@ xfs_dir2_leaf_addname( > > trace_xfs_dir2_leaf_addname(args); > > - error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); > + error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp); > if (error) > return error; > > @@ -1230,7 +1229,7 @@ xfs_dir2_leaf_lookup_int( > tp = args->trans; > mp = dp->i_mount; > > - error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); > + error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp); > if (error) > return error; > > diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h > index a730c5223c64..ade41556901a 100644 > --- a/fs/xfs/libxfs/xfs_dir2_priv.h > +++ b/fs/xfs/libxfs/xfs_dir2_priv.h > @@ -91,8 +91,8 @@ void xfs_dir2_leaf_hdr_from_disk(struct xfs_mount *mp, > struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from); > void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to, > struct xfs_dir3_icleaf_hdr *from); > -extern int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, > - xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp); > +int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, > + xfs_dablk_t fbno, struct xfs_buf **bpp); > extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp, > xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp); > extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args, > diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c > index 7983ea40668a..910e0bf85bd7 100644 > --- a/fs/xfs/scrub/dir.c > +++ b/fs/xfs/scrub/dir.c > @@ -497,7 +497,7 @@ xchk_directory_leaf1_bestfree( > int error; > > /* Read the free space block. */ > - error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, -1, &bp); > + error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, &bp); > if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, lblk, &error)) > goto out; > xchk_buffer_recheck(sc, bp); > -- > 2.20.1 >
diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index e2e4b2c6d6c2..2eee4e299e19 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -262,13 +262,12 @@ xfs_dir3_leaf_read( struct xfs_trans *tp, struct xfs_inode *dp, xfs_dablk_t fbno, - xfs_daddr_t mappedbno, struct xfs_buf **bpp) { int err; - err = xfs_da_read_buf(tp, dp, fbno, mappedbno, bpp, - XFS_DATA_FORK, &xfs_dir3_leaf1_buf_ops); + err = xfs_da_read_buf(tp, dp, fbno, -1, bpp, XFS_DATA_FORK, + &xfs_dir3_leaf1_buf_ops); if (!err && tp && *bpp) xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAF1_BUF); return err; @@ -639,7 +638,7 @@ xfs_dir2_leaf_addname( trace_xfs_dir2_leaf_addname(args); - error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); + error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp); if (error) return error; @@ -1230,7 +1229,7 @@ xfs_dir2_leaf_lookup_int( tp = args->trans; mp = dp->i_mount; - error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp); + error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp); if (error) return error; diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h index a730c5223c64..ade41556901a 100644 --- a/fs/xfs/libxfs/xfs_dir2_priv.h +++ b/fs/xfs/libxfs/xfs_dir2_priv.h @@ -91,8 +91,8 @@ void xfs_dir2_leaf_hdr_from_disk(struct xfs_mount *mp, struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from); void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to, struct xfs_dir3_icleaf_hdr *from); -extern int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, - xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp); +int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, + xfs_dablk_t fbno, struct xfs_buf **bpp); extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp, xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp); extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args, diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c index 7983ea40668a..910e0bf85bd7 100644 --- a/fs/xfs/scrub/dir.c +++ b/fs/xfs/scrub/dir.c @@ -497,7 +497,7 @@ xchk_directory_leaf1_bestfree( int error; /* Read the free space block. */ - error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, -1, &bp); + error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, &bp); if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, lblk, &error)) goto out; xchk_buffer_recheck(sc, bp);
This argument is always hard coded to -1, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_dir2_leaf.c | 9 ++++----- fs/xfs/libxfs/xfs_dir2_priv.h | 4 ++-- fs/xfs/scrub/dir.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-)