Skip to content

Commit 8d54b48

Browse files
Christoph Hellwigcmaiolino
authored andcommitted
xfs: remove the flags argument to xfs_buf_read_uncached
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 <[email protected]> Reviewed-by: Carlos Maiolino <[email protected]> Signed-off-by: Carlos Maiolino <[email protected]>
1 parent 44e1f90 commit 8d54b48

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

fs/xfs/xfs_buf.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,6 @@ xfs_buf_read_uncached(
802802
struct xfs_buftarg *target,
803803
xfs_daddr_t daddr,
804804
size_t numblks,
805-
xfs_buf_flags_t flags,
806805
struct xfs_buf **bpp,
807806
const struct xfs_buf_ops *ops)
808807
{
@@ -811,7 +810,7 @@ xfs_buf_read_uncached(
811810

812811
*bpp = NULL;
813812

814-
error = xfs_buf_get_uncached(target, numblks, flags, &bp);
813+
error = xfs_buf_get_uncached(target, numblks, 0, &bp);
815814
if (error)
816815
return error;
817816

fs/xfs/xfs_buf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ xfs_buf_readahead(
275275
int xfs_buf_get_uncached(struct xfs_buftarg *target, size_t numblks,
276276
xfs_buf_flags_t flags, struct xfs_buf **bpp);
277277
int xfs_buf_read_uncached(struct xfs_buftarg *target, xfs_daddr_t daddr,
278-
size_t numblks, xfs_buf_flags_t flags, struct xfs_buf **bpp,
278+
size_t numblks, struct xfs_buf **bpp,
279279
const struct xfs_buf_ops *ops);
280280
int _xfs_buf_read(struct xfs_buf *bp);
281281
void xfs_buf_hold(struct xfs_buf *bp);

fs/xfs/xfs_fsops.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ xfs_growfs_data_private(
111111
if (nb > mp->m_sb.sb_dblocks) {
112112
error = xfs_buf_read_uncached(mp->m_ddev_targp,
113113
XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1),
114-
XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL);
114+
XFS_FSS_TO_BB(mp, 1), &bp, NULL);
115115
if (error)
116116
return error;
117117
xfs_buf_relse(bp);

fs/xfs/xfs_mount.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ xfs_readsb(
186186
*/
187187
reread:
188188
error = xfs_buf_read_uncached(mp->m_ddev_targp, XFS_SB_DADDR,
189-
BTOBB(sector_size), 0, &bp, buf_ops);
189+
BTOBB(sector_size), &bp, buf_ops);
190190
if (error) {
191191
if (loud)
192192
xfs_warn(mp, "SB validate failed with error %d.", error);
@@ -414,7 +414,7 @@ xfs_check_sizes(
414414
}
415415
error = xfs_buf_read_uncached(mp->m_ddev_targp,
416416
d - XFS_FSS_TO_BB(mp, 1),
417-
XFS_FSS_TO_BB(mp, 1), 0, &bp, NULL);
417+
XFS_FSS_TO_BB(mp, 1), &bp, NULL);
418418
if (error) {
419419
xfs_warn(mp, "last sector read failed");
420420
return error;
@@ -431,7 +431,7 @@ xfs_check_sizes(
431431
}
432432
error = xfs_buf_read_uncached(mp->m_logdev_targp,
433433
d - XFS_FSB_TO_BB(mp, 1),
434-
XFS_FSB_TO_BB(mp, 1), 0, &bp, NULL);
434+
XFS_FSB_TO_BB(mp, 1), &bp, NULL);
435435
if (error) {
436436
xfs_warn(mp, "log device read failed");
437437
return error;

fs/xfs/xfs_rtalloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ xfs_rt_check_size(
13501350

13511351
error = xfs_buf_read_uncached(mp->m_rtdev_targp,
13521352
XFS_FSB_TO_BB(mp, mp->m_sb.sb_rtstart) + daddr,
1353-
XFS_FSB_TO_BB(mp, 1), 0, &bp, NULL);
1353+
XFS_FSB_TO_BB(mp, 1), &bp, NULL);
13541354
if (error)
13551355
xfs_warn(mp, "cannot read last RT device sector (%lld)",
13561356
last_block);
@@ -1511,7 +1511,7 @@ xfs_rtmount_readsb(
15111511

15121512
/* m_blkbb_log is not set up yet */
15131513
error = xfs_buf_read_uncached(mp->m_rtdev_targp, XFS_RTSB_DADDR,
1514-
mp->m_sb.sb_blocksize >> BBSHIFT, 0, &bp,
1514+
mp->m_sb.sb_blocksize >> BBSHIFT, &bp,
15151515
&xfs_rtsb_buf_ops);
15161516
if (error) {
15171517
xfs_warn(mp, "rt sb validate failed with error %d.", error);

0 commit comments

Comments
 (0)