diff options
| author | Mark Brown <broonie@kernel.org> | 2022-11-25 19:16:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-25 19:16:05 +0000 |
| commit | 5cd4d3886780bf9a846eada29a2aefe8bfcac027 (patch) | |
| tree | ea5cc9b11657912a1371932ad467a7a622e8010c /fs/btrfs/extent-io-tree.c | |
| parent | ef3232e3dbd172fa17190fa8a852a3180a73bbdc (diff) | |
| parent | f0c4d9fc9cc9462659728d168387191387e903cc (diff) | |
| download | linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.tar.gz linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.tar.bz2 linux-5cd4d3886780bf9a846eada29a2aefe8bfcac027.zip | |
Merge tag 'v6.1-rc4' into spi-6.2
Linux 6.1-rc4 which should get my CI working on RPi3s again.
Diffstat (limited to 'fs/btrfs/extent-io-tree.c')
| -rw-r--r-- | fs/btrfs/extent-io-tree.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c index 618275af19c4..83cb0378096f 100644 --- a/fs/btrfs/extent-io-tree.c +++ b/fs/btrfs/extent-io-tree.c @@ -1641,16 +1641,17 @@ int lock_extent(struct extent_io_tree *tree, u64 start, u64 end, int err; u64 failed_start; - while (1) { + err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, &failed_start, + cached_state, NULL, GFP_NOFS); + while (err == -EEXIST) { + if (failed_start != start) + clear_extent_bit(tree, start, failed_start - 1, + EXTENT_LOCKED, cached_state); + + wait_extent_bit(tree, failed_start, end, EXTENT_LOCKED); err = __set_extent_bit(tree, start, end, EXTENT_LOCKED, &failed_start, cached_state, NULL, GFP_NOFS); - if (err == -EEXIST) { - wait_extent_bit(tree, failed_start, end, EXTENT_LOCKED); - start = failed_start; - } else - break; - WARN_ON(start > end); } return err; } |