From: Christoph Hellwig <hch@lst.de>
Date: Wed, 7 May 2025 22:00:04 +0000 (-0700)
Subject: xfs: remove the flags argument to xfs_buf_get_uncached
X-Git-Tag: v6.15.0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a6b49d23aafda09094b4d79024ac6eb35b9ae76;p=thirdparty%2Fxfsprogs-dev.git

xfs: remove the flags argument to xfs_buf_get_uncached

Source kernel commit: b3f8f2903b8cd48b0746bf05a40b85ae4b684034

No callers passes flags to xfs_buf_get_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>
---

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 99372eb6..5562e292 100644
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -254,7 +254,7 @@ xfs_buf_hold(struct xfs_buf *bp)
 void xfs_buf_lock(struct xfs_buf *bp);
 void xfs_buf_unlock(struct xfs_buf *bp);
 
-int libxfs_buf_get_uncached(struct xfs_buftarg *targ, size_t bblen, int flags,
+int libxfs_buf_get_uncached(struct xfs_buftarg *targ, size_t bblen,
 		struct xfs_buf **bpp);
 int libxfs_buf_read_uncached(struct xfs_buftarg *targ, xfs_daddr_t daddr,
 		size_t bblen, int flags, struct xfs_buf **bpp,
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index f06763b3..5c14dbb5 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -770,7 +770,6 @@ int
 libxfs_buf_get_uncached(
 	struct xfs_buftarg	*targ,
 	size_t			bblen,
-	int			flags,
 	struct xfs_buf		**bpp)
 {
 	*bpp = libxfs_getbufr_uncached(targ, XFS_BUF_DADDR_NULL, bblen);
diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 095b581a..ea64e9ea 100644
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -299,7 +299,7 @@ xfs_get_aghdr_buf(
 	struct xfs_buf		*bp;
 	int			error;
 
-	error = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, 0, &bp);
+	error = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, &bp);
 	if (error)
 		return error;
 
diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index 31b11fee..275593a3 100644
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -69,7 +69,7 @@ xlog_get_bp(
 		nbblks += log->l_sectBBsize;
 	nbblks = round_up(nbblks, log->l_sectBBsize);
 
-	libxfs_buf_get_uncached(log->l_dev, nbblks, 0, &bp);
+	libxfs_buf_get_uncached(log->l_dev, nbblks, &bp);
 	return bp;
 }
 
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 9192694d..812241c4 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -5208,7 +5208,7 @@ alloc_write_buf(
 	struct xfs_buf		*bp;
 	int			error;
 
-	error = -libxfs_buf_get_uncached(btp, bblen, 0, &bp);
+	error = -libxfs_buf_get_uncached(btp, bblen, &bp);
 	if (error) {
 		fprintf(stderr, _("Could not get memory for buffer, err=%d\n"),
 				error);
@@ -5595,7 +5595,7 @@ write_rtsb(
 	}
 
 	error = -libxfs_buf_get_uncached(mp->m_rtdev_targp,
-				XFS_FSB_TO_BB(mp, 1), 0, &rtsb_bp);
+				XFS_FSB_TO_BB(mp, 1), &rtsb_bp);
 	if (error) {
 		fprintf(stderr,
  _("%s: couldn't grab realtime superblock buffer\n"), progname);
diff --git a/repair/rt.c b/repair/rt.c
index a2478fb6..1ac2bf6f 100644
--- a/repair/rt.c
+++ b/repair/rt.c
@@ -618,7 +618,7 @@ rewrite_rtsb(
  _("couldn't grab primary sb to update realtime sb\n"));
 
 	error = -libxfs_buf_get_uncached(mp->m_rtdev_targp,
-			XFS_FSB_TO_BB(mp, 1), 0, &rtsb_bp);
+			XFS_FSB_TO_BB(mp, 1), &rtsb_bp);
 	if (error)
 		do_error(
  _("couldn't grab realtime superblock\n"));