diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-21 08:45:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-02-21 08:45:07 -0800 |
| commit | 8da8d88455ebbb4e05423cf60cff985e92d43754 (patch) | |
| tree | a24dd9b83769e9b3cae9fe44b4c377d9288ca325 /fs/btrfs/defrag.c | |
| parent | d8be5a55b8e3f7eab8f36ceed2512f457f914318 (diff) | |
| parent | b0ad381fa7690244802aed119b478b4bdafc31dd (diff) | |
Merge tag 'for-6.8-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- Fix a deadlock in fiemap.
There was a big lock around the whole operation that can interfere
with a page fault and mkwrite.
Reducing the lock scope can also speed up fiemap
- Fix range condition for extent defragmentation which could lead to
worse layout in some cases
* tag 'for-6.8-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix deadlock with fiemap and extent locking
btrfs: defrag: avoid unnecessary defrag caused by incorrect extent size
Diffstat (limited to 'fs/btrfs/defrag.c')
| -rw-r--r-- | fs/btrfs/defrag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c index c276b136ab63..5b0b64571418 100644 --- a/fs/btrfs/defrag.c +++ b/fs/btrfs/defrag.c @@ -1046,7 +1046,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode, goto add; /* Skip too large extent */ - if (range_len >= extent_thresh) + if (em->len >= extent_thresh) goto next; /* |