From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 Nov 2017 04:08:59 +0000 (-0600)
Subject: xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi
X-Git-Tag: v4.15.0-rc1~143^2~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9fa15aa053d11a13f90d324338decdaa69f556c;p=thirdparty%2Fxfsprogs-dev.git

xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi

Source kernel commit: b213d69293cf003e6f0c63adfee6fcc70e3afee6

The XFS_BTCUR_BPRV_WASDEL flag is supposed to indicate that we are
converting a delayed allocation to a real one, which isn't the case
in xfs_bunmapi.  Setting it could theoretically lead to misaccounting
here, but it's unlikely that we ever hit it in practice.

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_bmap.c b/libxfs/xfs_bmap.c
index 836655707..ae36f7582 100644
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -5714,11 +5714,7 @@ __xfs_bunmapi(
 					XFS_QMOPT_RES_REGBLKS);
 			}
 			ip->i_delayed_blks -= del.br_blockcount;
-			if (cur)
-				cur->bc_private.b.flags |=
-					XFS_BTCUR_BPRV_WASDEL;
-		} else if (cur)
-			cur->bc_private.b.flags &= ~XFS_BTCUR_BPRV_WASDEL;
+		}
 
 		error = xfs_bmap_del_extent(ip, tp, &lastx, dfops, cur, &del,
 				&tmp_logflags, whichfork, flags);