From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 Nov 2017 04:11:32 +0000 (-0600)
Subject: xfs: make better use of the 'state' variable in xfs_bmap_del_extent_real
X-Git-Tag: v4.15.0-rc1~143^2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a32da85cc31676e2da23d63c01a0219f7f8cbe8;p=thirdparty%2Fxfsprogs-dev.git

xfs: make better use of the 'state' variable in xfs_bmap_del_extent_real

Source kernel commit: 35e62da55f4b2450cbb51c9734d745a799e2a793

We already have all the information about the fork a=D1=95 well as additional
tracing information, so pass that to xfs_iext_remove().

Signed-off-by: Christoph Hellwig <hch@lst.de>
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_bmap.c b/libxfs/xfs_bmap.c
index ed70f094e..552cab194 100644
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -5024,8 +5024,7 @@ xfs_bmap_del_extent_real(
 		 * Matches the whole extent.  Delete the entry.
 		 */
 		trace_xfs_bmap_pre_update(ip, *idx, state, _THIS_IP_);
-		xfs_iext_remove(ip, *idx, 1,
-				whichfork == XFS_ATTR_FORK ? BMAP_ATTRFORK : 0);
+		xfs_iext_remove(ip, *idx, 1, state);
 		--*idx;
 
 		XFS_IFORK_NEXT_SET(ip, whichfork,