From: Christoph Hellwig <hch@lst.de>
Date: Mon, 10 Aug 2020 20:32:05 +0000 (-0400)
Subject: xfs: xfs_bmapi_read doesn't take a fork id as the last argument
X-Git-Tag: v5.8.0-rc0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5d227007add2c046c9897c9c68fd71668daf6b2;p=thirdparty%2Fxfsprogs-dev.git

xfs: xfs_bmapi_read doesn't take a fork id as the last argument

Source kernel commit: b90c2a9c8b4422bb9398b50fe3d6163e46dcddec

The last argument to xfs_bmapi_raad contains XFS_BMAPI_* flags, not the
fork.  Given that XFS_DATA_FORK evaluates to 0 no real harm is done,
but let's fix this anyway.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
index 44ad96fc1..4df279cd9 100644
--- a/libxfs/xfs_rtbitmap.c
+++ b/libxfs/xfs_rtbitmap.c
@@ -64,7 +64,7 @@ xfs_rtbuf_get(
 
 	ip = issum ? mp->m_rsumip : mp->m_rbmip;
 
-	error = xfs_bmapi_read(ip, block, 1, &map, &nmap, XFS_DATA_FORK);
+	error = xfs_bmapi_read(ip, block, 1, &map, &nmap, 0);
 	if (error)
 		return error;