xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi
authorChristoph Hellwig <hch@lst.de>
Tue, 17 Oct 2017 21:16:20 +0000 (14:16 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Thu, 26 Oct 2017 22:38:20 +0000 (15:38 -0700)
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>
fs/xfs/libxfs/xfs_bmap.c

index e7146026e8f6f94ace398f3306787e24a54c50c6..9db566b7e45e547d1bd11a3e6e5087fdc419fab9 100644 (file)
@@ -5723,11 +5723,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);