diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-12 12:28:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-12 12:28:39 -0700 |
| commit | edf6b0e1e4ddb12e022ce0c17829bad6d4161ea7 (patch) | |
| tree | fda92514d64fac1bd8d47a6297249dc4e233a50b /fs/btrfs/disk-io.c | |
| parent | 5a3c558a9f05f4664f569b06f04d6b217785fd21 (diff) | |
| parent | 2d892ccdc163a3d2e08c5ed1cea8b61bf7e4f531 (diff) | |
| download | kernel_replicant_linux-edf6b0e1e4ddb12e022ce0c17829bad6d4161ea7.tar.gz kernel_replicant_linux-edf6b0e1e4ddb12e022ce0c17829bad6d4161ea7.tar.bz2 kernel_replicant_linux-edf6b0e1e4ddb12e022ce0c17829bad6d4161ea7.zip | |
Merge tag 'for-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"A few more fixes:
- regression fix for a crash after failed snapshot creation
- one more lockep fix: use nofs allocation when allocating missing
device
- fix reloc tree leak on degraded mount
- make some extent buffer alignment checks less strict to mount
filesystems created by btrfs-convert"
* tag 'for-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix NULL pointer dereference after failure to create snapshot
btrfs: free data reloc tree on failed mount
btrfs: require only sector size alignment for parent eb bytenr
btrfs: fix lockdep splat in add_missing_dev
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index f6bba7eb1fa1..abf86b202b43 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3418,6 +3418,8 @@ fail_block_groups: btrfs_put_block_group_cache(fs_info); fail_tree_roots: + if (fs_info->data_reloc_root) + btrfs_drop_and_free_fs_root(fs_info, fs_info->data_reloc_root); free_root_pointers(fs_info, true); invalidate_inode_pages2(fs_info->btree_inode->i_mapping); |