]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xfs: consider minlen sized extents in xfs_rtallocate_extent_block
authorChristoph Hellwig <hch@lst.de>
Wed, 27 Mar 2024 00:12:12 +0000 (17:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:28:46 +0000 (15:28 +0200)
commit 944df75958807d56f2db9fdc769eb15dd9f0366a upstream.

[backport: resolve merge conflict due to missing xfs_rtxlen_t type]

minlen is the lower bound on the extent length that the caller can
accept, and maxlen is at this point the maximal available length.
This means a minlen extent is perfectly fine to use, so do it.  This
matches the equivalent logic in xfs_rtallocate_extent_exact that also
accepts a minlen sized extent.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/xfs/xfs_rtalloc.c

index f2eb0c8b595db4fd08af08c54ba5f677c2f2c6e5..5a439d90e51cc6caec7fef194a4ce964100e4cbd 100644 (file)
@@ -318,7 +318,7 @@ xfs_rtallocate_extent_block(
        /*
         * Searched the whole thing & didn't find a maxlen free extent.
         */
-       if (minlen < maxlen && besti != -1) {
+       if (minlen <= maxlen && besti != -1) {
                xfs_extlen_t    p;      /* amount to trim length by */
 
                /*