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 ed70f094ec93be14b61ce40f1843931ed150065e..552cab1949f5b65e992c9910e63aec21ce510193 100644 (file)
--- 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,