| Message ID | 20250317054850.1132557-5-hch@lst.de (mailing list archive) |
|---|---|
| State | Queued |
| Headers | show |
| Series | [1/5] xfs: call xfs_buf_alloc_backing_mem from _xfs_buf_alloc | expand |
On Mon, Mar 17, 2025 at 06:48:35AM +0100, Christoph Hellwig wrote: > No callers passes flags to xfs_buf_read_uncached, which makes sense > given that the flags apply to behavior not used for uncached buffers. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > --- > fs/xfs/xfs_buf.c | 3 +-- > fs/xfs/xfs_buf.h | 2 +- > fs/xfs/xfs_fsops.c | 2 +- > fs/xfs/xfs_mount.c | 6 +++--- > fs/xfs/xfs_rtalloc.c | 4 ++-- > 5 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > index bf75964bbfe8..6469a69b18fe 100644 > --- a/fs/xfs/xfs_buf.c > +++ b/fs/xfs/xfs_buf.c > @@ -802,7 +802,6 @@ xfs_buf_read_uncached( > struct xfs_buftarg *target, > xfs_daddr_t daddr, > size_t numblks, > - xfs_buf_flags_t flags, > struct xfs_buf **bpp, > const struct xfs_buf_ops *ops) > { > @@ -811,7 +810,7 @@ xfs_buf_read_uncached( > > *bpp = NULL; > > - error = xfs_buf_get_uncached(target, numblks, flags, &bp); > + error = xfs_buf_get_uncached(target, numblks, 0, &bp); > if (error) > return error; > > diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h > index db43bdc17f55..6a426a8d6197 100644 > --- a/fs/xfs/xfs_buf.h > +++ b/fs/xfs/xfs_buf.h > @@ -275,7 +275,7 @@ xfs_buf_readahead( > int xfs_buf_get_uncached(struct xfs_buftarg *target, size_t numblks, > xfs_buf_flags_t flags, struct xfs_buf **bpp); > int xfs_buf_read_uncached(struct xfs_buftarg *target, xfs_daddr_t daddr, > - size_t numblks, xfs_buf_flags_t flags, struct xfs_buf **bpp, > + size_t numblks, struct xfs_buf **bpp, > const struct xfs_buf_ops *ops); > int _xfs_buf_read(struct xfs_buf *bp); > void xfs_buf_hold(struct xfs_buf *bp); > diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c > index b6f3d7abdae5..0ada73569394 100644 > --- a/fs/xfs/xfs_fsops.c > +++ b/fs/xfs/xfs_fsops.c > @@ -111,7 +111,7 @@ xfs_growfs_data_private( > if (nb > mp->m_sb.sb_dblocks) { > error = xfs_buf_read_uncached(mp->m_ddev_targp, > XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1), > - XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL); > + XFS_FSS_TO_BB(mp, 1), &bp, NULL); > if (error) > return error; > xfs_buf_relse(bp); > diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c > index e65a659901d5..00b53f479ece 100644 > --- a/fs/xfs/xfs_mount.c > +++ b/fs/xfs/xfs_mount.c > @@ -186,7 +186,7 @@ xfs_readsb( > */ > reread: > error = xfs_buf_read_uncached(mp->m_ddev_targp, XFS_SB_DADDR, > - BTOBB(sector_size), 0, &bp, buf_ops); > + BTOBB(sector_size), &bp, buf_ops); > if (error) { > if (loud) > xfs_warn(mp, "SB validate failed with error %d.", error); > @@ -414,7 +414,7 @@ xfs_check_sizes( > } > error = xfs_buf_read_uncached(mp->m_ddev_targp, > d - XFS_FSS_TO_BB(mp, 1), > - XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL); > + XFS_FSS_TO_BB(mp, 1), &bp, NULL); > if (error) { > xfs_warn(mp, "last sector read failed"); > return error; > @@ -431,7 +431,7 @@ xfs_check_sizes( > } > error = xfs_buf_read_uncached(mp->m_logdev_targp, > d - XFS_FSB_TO_BB(mp, 1), > - XFS_FSB_TO_BB(mp, 1), 0, &bp, NULL); > + XFS_FSB_TO_BB(mp, 1), &bp, NULL); > if (error) { > xfs_warn(mp, "log device read failed"); > return error; > diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c > index 3aa222ea9500..e35c728f222e 100644 > --- a/fs/xfs/xfs_rtalloc.c > +++ b/fs/xfs/xfs_rtalloc.c > @@ -1350,7 +1350,7 @@ xfs_rt_check_size( > > error = xfs_buf_read_uncached(mp->m_rtdev_targp, > XFS_FSB_TO_BB(mp, mp->m_sb.sb_rtstart) + daddr, > - XFS_FSB_TO_BB(mp, 1), 0, &bp, NULL); > + XFS_FSB_TO_BB(mp, 1), &bp, NULL); > if (error) > xfs_warn(mp, "cannot read last RT device sector (%lld)", > last_block); > @@ -1511,7 +1511,7 @@ xfs_rtmount_readsb( > > /* m_blkbb_log is not set up yet */ > error = xfs_buf_read_uncached(mp->m_rtdev_targp, XFS_RTSB_DADDR, > - mp->m_sb.sb_blocksize >> BBSHIFT, 0, &bp, > + mp->m_sb.sb_blocksize >> BBSHIFT, &bp, > &xfs_rtsb_buf_ops); > if (error) { > xfs_warn(mp, "rt sb validate failed with error %d.", error); > -- > 2.45.2 >
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index bf75964bbfe8..6469a69b18fe 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -802,7 +802,6 @@ xfs_buf_read_uncached( struct xfs_buftarg *target, xfs_daddr_t daddr, size_t numblks, - xfs_buf_flags_t flags, struct xfs_buf **bpp, const struct xfs_buf_ops *ops) { @@ -811,7 +810,7 @@ xfs_buf_read_uncached( *bpp = NULL; - error = xfs_buf_get_uncached(target, numblks, flags, &bp); + error = xfs_buf_get_uncached(target, numblks, 0, &bp); if (error) return error; diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index db43bdc17f55..6a426a8d6197 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h @@ -275,7 +275,7 @@ xfs_buf_readahead( int xfs_buf_get_uncached(struct xfs_buftarg *target, size_t numblks, xfs_buf_flags_t flags, struct xfs_buf **bpp); int xfs_buf_read_uncached(struct xfs_buftarg *target, xfs_daddr_t daddr, - size_t numblks, xfs_buf_flags_t flags, struct xfs_buf **bpp, + size_t numblks, struct xfs_buf **bpp, const struct xfs_buf_ops *ops); int _xfs_buf_read(struct xfs_buf *bp); void xfs_buf_hold(struct xfs_buf *bp); diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index b6f3d7abdae5..0ada73569394 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -111,7 +111,7 @@ xfs_growfs_data_private( if (nb > mp->m_sb.sb_dblocks) { error = xfs_buf_read_uncached(mp->m_ddev_targp, XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1), - XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL); + XFS_FSS_TO_BB(mp, 1), &bp, NULL); if (error) return error; xfs_buf_relse(bp); diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index e65a659901d5..00b53f479ece 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -186,7 +186,7 @@ xfs_readsb( */ reread: error = xfs_buf_read_uncached(mp->m_ddev_targp, XFS_SB_DADDR, - BTOBB(sector_size), 0, &bp, buf_ops); + BTOBB(sector_size), &bp, buf_ops); if (error) { if (loud) xfs_warn(mp, "SB validate failed with error %d.", error); @@ -414,7 +414,7 @@ xfs_check_sizes( } error = xfs_buf_read_uncached(mp->m_ddev_targp, d - XFS_FSS_TO_BB(mp, 1), - XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL); + XFS_FSS_TO_BB(mp, 1), &bp, NULL); if (error) { xfs_warn(mp, "last sector read failed"); return error; @@ -431,7 +431,7 @@ xfs_check_sizes( } error = xfs_buf_read_uncached(mp->m_logdev_targp, d - XFS_FSB_TO_BB(mp, 1), - XFS_FSB_TO_BB(mp, 1), 0, &bp, NULL); + XFS_FSB_TO_BB(mp, 1), &bp, NULL); if (error) { xfs_warn(mp, "log device read failed"); return error; diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 3aa222ea9500..e35c728f222e 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -1350,7 +1350,7 @@ xfs_rt_check_size( error = xfs_buf_read_uncached(mp->m_rtdev_targp, XFS_FSB_TO_BB(mp, mp->m_sb.sb_rtstart) + daddr, - XFS_FSB_TO_BB(mp, 1), 0, &bp, NULL); + XFS_FSB_TO_BB(mp, 1), &bp, NULL); if (error) xfs_warn(mp, "cannot read last RT device sector (%lld)", last_block); @@ -1511,7 +1511,7 @@ xfs_rtmount_readsb( /* m_blkbb_log is not set up yet */ error = xfs_buf_read_uncached(mp->m_rtdev_targp, XFS_RTSB_DADDR, - mp->m_sb.sb_blocksize >> BBSHIFT, 0, &bp, + mp->m_sb.sb_blocksize >> BBSHIFT, &bp, &xfs_rtsb_buf_ops); if (error) { xfs_warn(mp, "rt sb validate failed with error %d.", error);
No callers passes flags to xfs_buf_read_uncached, which makes sense given that the flags apply to behavior not used for uncached buffers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_buf.c | 3 +-- fs/xfs/xfs_buf.h | 2 +- fs/xfs/xfs_fsops.c | 2 +- fs/xfs/xfs_mount.c | 6 +++--- fs/xfs/xfs_rtalloc.c | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-)