xfs: Check for extent overflow when removing dir entries
authorChandan Babu R <chandanrlinux@gmail.com>
Sat, 23 Jan 2021 00:48:12 +0000 (16:48 -0800)
committerDarrick J. Wong <djwong@kernel.org>
Sat, 23 Jan 2021 00:54:47 +0000 (16:54 -0800)
Directory entry removal must always succeed; Hence XFS does the
following during low disk space scenario:
1. Data/Free blocks linger until a future remove operation.
2. Dabtree blocks would be swapped with the last block in the leaf space
   and then the new last block will be unmapped.

This facility is reused during low inode extent count scenario i.e. this
commit causes xfs_bmap_del_extent_real() to return -ENOSPC error code so
that the above mentioned behaviour is exercised causing no change to the
directory's extent count.

Signed-off-by: Chandan Babu R <chandanrlinux@gmail.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 32aeacf..6c8f17a 100644 (file)
@@ -5151,6 +5151,24 @@ xfs_bmap_del_extent_real(
                /*
                 * Deleting the middle of the extent.
                 */
+
+               /*
+                * For directories, -ENOSPC is returned since a directory entry
+                * remove operation must not fail due to low extent count
+                * availability. -ENOSPC will be handled by higher layers of XFS
+                * by letting the corresponding empty Data/Free blocks to linger
+                * until a future remove operation. Dabtree blocks would be
+                * swapped with the last block in the leaf space and then the
+                * new last block will be unmapped.
+                */
+               error = xfs_iext_count_may_overflow(ip, whichfork, 1);
+               if (error) {
+                       ASSERT(S_ISDIR(VFS_I(ip)->i_mode) &&
+                               whichfork == XFS_DATA_FORK);
+                       error = -ENOSPC;
+                       goto done;
+               }
+
                old = got;
 
                got.br_blockcount = del->br_startoff - got.br_startoff;