]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
xfs: remove the flags argument to xfs_buf_read_uncached
authorChristoph Hellwig <hch@lst.de>
Mon, 17 Mar 2025 05:48:35 +0000 (06:48 +0100)
committerCarlos Maiolino <cem@kernel.org>
Tue, 18 Mar 2025 13:47:45 +0000 (14:47 +0100)
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>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
fs/xfs/xfs_buf.c
fs/xfs/xfs_buf.h
fs/xfs/xfs_fsops.c
fs/xfs/xfs_mount.c
fs/xfs/xfs_rtalloc.c

index bf75964bbfe8ef57f9258da7ac7d735469363a9c..6469a69b18fe6cc7eb9fd542e7e915b92d5332db 100644 (file)
@@ -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;
 
index db43bdc17f55bb50fbab291330ebd8692c6f3e26..6a426a8d61971176cf7eb08e2e56e6a2af5e53f9 100644 (file)
@@ -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);
index b6f3d7abdae52e7f32f10a8482c4e9d519535432..0ada735693945cd048d5cf0531b476499e7ee412 100644 (file)
@@ -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);
index e65a659901d5ce50e0d51ef52d2531fca282376e..00b53f479ececa9a452ac401733629607fb3cf22 100644 (file)
@@ -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;
index 3aa222ea9500c1479a750620540e8be193497928..e35c728f222ebe686896b9d367cfa4ebdfc444af 100644 (file)
@@ -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);