diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-02 19:49:12 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-02 19:49:12 +0200 |
commit | f03359bca01bf4372cf2c118cd9a987a5951b1c8 (patch) | |
tree | 9b3f6e801d2a875ff4a4c91c9639314cdb309916 /fs/btrfs/volumes.c | |
parent | Merge tag 's390-6.9-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/... (diff) | |
parent | btrfs: set correct ram_bytes when splitting ordered extent (diff) | |
download | linux-f03359bca01bf4372cf2c118cd9a987a5951b1c8.tar.xz linux-f03359bca01bf4372cf2c118cd9a987a5951b1c8.zip |
Merge tag 'for-6.9-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- set correct ram_bytes when splitting ordered extent. This can be
inconsistent on-disk but harmless as it's not used for calculations
and it's only advisory for compression
- fix lockdep splat when taking cleaner mutex in qgroups disable ioctl
- fix missing mutex unlock on error path when looking up sys chunk for
relocation
* tag 'for-6.9-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: set correct ram_bytes when splitting ordered extent
btrfs: take the cleaner_mutex earlier in qgroup disable
btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r-- | fs/btrfs/volumes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f15591f3e54f..ef6bd2f4251b 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3455,6 +3455,7 @@ again: * alignment and size). */ ret = -EUCLEAN; + mutex_unlock(&fs_info->reclaim_bgs_lock); goto error; } |