]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: fix units conversion error in xfs_bmap_del_extent_delay
authorDarrick J. Wong <djwong@kernel.org>
Mon, 12 Feb 2024 14:02:05 +0000 (15:02 +0100)
committerCarlos Maiolino <cem@kernel.org>
Thu, 15 Feb 2024 11:56:43 +0000 (12:56 +0100)
Source kernel commit: ddd98076d5c075c8a6c49d9e6e8ee12844137f23

The unit conversions in this function do not make sense.  First we
convert a block count to bytes, then divide that bytes value by
rextsize, which is in blocks, to get an rt extent count.  You can't
divide bytes by blocks to get a (possibly multiblock) extent value.

Fortunately nobody uses delalloc on the rt volume so this hasn't
mattered.

Fixes: fa5c836ca8eb5 ("xfs: refactor xfs_bunmapi_cow")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
libxfs/xfs_bmap.c

index 5744b882ba90e3f2ba3dd06487b90e5e31d25b6a..6fbfcb25ad7e56482f2119cbda0639ffd899911a 100644 (file)
@@ -4820,7 +4820,7 @@ xfs_bmap_del_extent_delay(
        ASSERT(got_endoff >= del_endoff);
 
        if (isrt) {
-               uint64_t rtexts = XFS_FSB_TO_B(mp, del->br_blockcount);
+               uint64_t        rtexts = del->br_blockcount;
 
                do_div(rtexts, mp->m_sb.sb_rextsize);
                xfs_mod_frextents(mp, rtexts);