]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: simplify iext overflow checking and upgrade
authorChristoph Hellwig <hch@lst.de>
Mon, 29 Jul 2024 23:22:57 +0000 (16:22 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Tue, 30 Jul 2024 00:01:05 +0000 (17:01 -0700)
Source kernel commit: 25576c5420e61dea4c2b52942460f2221b8e46e8

Currently the calls to xfs_iext_count_may_overflow and
xfs_iext_count_upgrade are always paired.  Merge them into a single
function to simplify the callers and the actual check and upgrade
logic itself.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
libxfs/xfs_attr.c
libxfs/xfs_bmap.c
libxfs/xfs_inode_fork.c
libxfs/xfs_inode_fork.h

index 99648d78cd041b907a69fffc4c9f4df23e0c5b32..9d32aa406571b857773de32b8c7291ccc758e21c 100644 (file)
@@ -1049,11 +1049,8 @@ xfs_attr_set(
                return error;
 
        if (op != XFS_ATTRUPDATE_REMOVE || xfs_inode_hasattr(dp)) {
-               error = xfs_iext_count_may_overflow(dp, XFS_ATTR_FORK,
+               error = xfs_iext_count_extend(args->trans, dp, XFS_ATTR_FORK,
                                XFS_IEXT_ATTR_MANIP_CNT(rmt_blks));
-               if (error == -EFBIG)
-                       error = xfs_iext_count_upgrade(args->trans, dp,
-                                       XFS_IEXT_ATTR_MANIP_CNT(rmt_blks));
                if (error)
                        goto out_trans_cancel;
        }
index 4a365f1a186f60fc83b2c66674c78eb7ba2c7182..347b444237e32fa986344dc6702ce346b1bc827b 100644 (file)
@@ -4645,11 +4645,8 @@ xfs_bmapi_convert_one_delalloc(
        xfs_ilock(ip, XFS_ILOCK_EXCL);
        xfs_trans_ijoin(tp, ip, 0);
 
-       error = xfs_iext_count_may_overflow(ip, whichfork,
+       error = xfs_iext_count_extend(tp, ip, whichfork,
                        XFS_IEXT_ADD_NOSPLIT_CNT);
-       if (error == -EFBIG)
-               error = xfs_iext_count_upgrade(tp, ip,
-                               XFS_IEXT_ADD_NOSPLIT_CNT);
        if (error)
                goto out_trans_cancel;
 
index d9f0a21ac9d6589827c48bdb1c5ffdb0d33c669e..cd5e2e72954292ada64ceeb2cccb2eb1686ae276 100644 (file)
@@ -763,53 +763,46 @@ xfs_ifork_verify_local_attr(
        return 0;
 }
 
+/*
+ * Check if the inode fork supports adding nr_to_add more extents.
+ *
+ * If it doesn't but we can upgrade it to large extent counters, do the upgrade.
+ * If we can't upgrade or are already using big counters but still can't fit the
+ * additional extents, return -EFBIG.
+ */
 int
-xfs_iext_count_may_overflow(
+xfs_iext_count_extend(
+       struct xfs_trans        *tp,
        struct xfs_inode        *ip,
        int                     whichfork,
-       int                     nr_to_add)
+       uint                    nr_to_add)
 {
+       struct xfs_mount        *mp = ip->i_mount;
+       bool                    has_large =
+               xfs_inode_has_large_extent_counts(ip);
        struct xfs_ifork        *ifp = xfs_ifork_ptr(ip, whichfork);
-       uint64_t                max_exts;
        uint64_t                nr_exts;
 
+       ASSERT(nr_to_add <= XFS_MAX_EXTCNT_UPGRADE_NR);
+
        if (whichfork == XFS_COW_FORK)
                return 0;
 
-       max_exts = xfs_iext_max_nextents(xfs_inode_has_large_extent_counts(ip),
-                               whichfork);
-
-       if (XFS_TEST_ERROR(false, ip->i_mount, XFS_ERRTAG_REDUCE_MAX_IEXTENTS))
-               max_exts = 10;
-
+       /* no point in upgrading if if_nextents overflows */
        nr_exts = ifp->if_nextents + nr_to_add;
-       if (nr_exts < ifp->if_nextents || nr_exts > max_exts)
+       if (nr_exts < ifp->if_nextents)
                return -EFBIG;
 
-       return 0;
-}
-
-/*
- * Upgrade this inode's extent counter fields to be able to handle a potential
- * increase in the extent count by nr_to_add.  Normally this is the same
- * quantity that caused xfs_iext_count_may_overflow() to return -EFBIG.
- */
-int
-xfs_iext_count_upgrade(
-       struct xfs_trans        *tp,
-       struct xfs_inode        *ip,
-       uint                    nr_to_add)
-{
-       ASSERT(nr_to_add <= XFS_MAX_EXTCNT_UPGRADE_NR);
-
-       if (!xfs_has_large_extent_counts(ip->i_mount) ||
-           xfs_inode_has_large_extent_counts(ip) ||
-           XFS_TEST_ERROR(false, ip->i_mount, XFS_ERRTAG_REDUCE_MAX_IEXTENTS))
+       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REDUCE_MAX_IEXTENTS) &&
+           nr_exts > 10)
                return -EFBIG;
 
-       ip->i_diflags2 |= XFS_DIFLAG2_NREXT64;
-       xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
-
+       if (nr_exts > xfs_iext_max_nextents(has_large, whichfork)) {
+               if (has_large || !xfs_has_large_extent_counts(mp))
+                       return -EFBIG;
+               ip->i_diflags2 |= XFS_DIFLAG2_NREXT64;
+               xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
+       }
        return 0;
 }
 
index bd53eb951b6515e1748cca91d2a926f81edf91d0..2373d12fd474f0cc4f8227a038a554649f580ee7 100644 (file)
@@ -256,10 +256,8 @@ extern void xfs_ifork_init_cow(struct xfs_inode *ip);
 
 int xfs_ifork_verify_local_data(struct xfs_inode *ip);
 int xfs_ifork_verify_local_attr(struct xfs_inode *ip);
-int xfs_iext_count_may_overflow(struct xfs_inode *ip, int whichfork,
-               int nr_to_add);
-int xfs_iext_count_upgrade(struct xfs_trans *tp, struct xfs_inode *ip,
-               uint nr_to_add);
+int xfs_iext_count_extend(struct xfs_trans *tp, struct xfs_inode *ip,
+               int whichfork, uint nr_to_add);
 bool xfs_ifork_is_realtime(struct xfs_inode *ip, int whichfork);
 
 /* returns true if the fork has extents but they are not read in yet. */