]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: don't loop for nowait writes when checking for cross references
authorFilipe Manana <fdmanana@suse.com>
Fri, 15 Nov 2024 15:46:13 +0000 (15:46 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Dec 2024 09:40:56 +0000 (10:40 +0100)
[ Upstream commit ed67f2a913a4f0fc505db29805c41dd07d3cb356 ]

When checking for delayed refs when verifying if there are cross
references for a data extent, we stop if the path has nowait set and we
can't try lock the delayed ref head's mutex, returning -EAGAIN with the
goal of making a write fallback to a blocking context. However we ignore
the -EAGAIN at btrfs_cross_ref_exist() when check_delayed_ref() returns
it, and keep looping instead of immediately returning the -EAGAIN to the
caller.

Fix this by not looping if we get -EAGAIN and we have a nowait path.

Fixes: 26ce91144631 ("btrfs: make can_nocow_extent nowait compatible")
CC: stable@vger.kernel.org # 6.1+
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/extent-tree.c

index d9f511babd89ab5636e4aa1101c5ac7ad9dac1d9..b43a8611aca5c6727a9904d327160e22e4d0b7be 100644 (file)
@@ -2446,7 +2446,7 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset,
                        goto out;
 
                ret = check_delayed_ref(root, path, objectid, offset, bytenr);
-       } while (ret == -EAGAIN);
+       } while (ret == -EAGAIN && !path->nowait);
 
 out:
        btrfs_release_path(path);