diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-08-17 21:58:33 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-08-25 03:58:29 -0700 |
| commit | 35bbb97fc898aeb874cb7c8b746f091caa359994 (patch) | |
| tree | 4ff7e4a0ac701e26985efb0d24c0ea3665791ffc /fs/btrfs/disk-io.c | |
| parent | 187ee58c62c1d0d238d3dc4835869d33e1869906 (diff) | |
| download | lwn-35bbb97fc898aeb874cb7c8b746f091caa359994.tar.gz lwn-35bbb97fc898aeb874cb7c8b746f091caa359994.zip | |
btrfs: don't create or leak aliased root while cleaning up orphans
commit 909c3a22da3 (Btrfs: fix loading of orphan roots leading to BUG_ON)
avoids the BUG_ON but can add an aliased root to the dead_roots list or
leak the root.
Since we've already been loading roots into the radix tree, we should
use it before looking the root up on disk.
Cc: <stable@vger.kernel.org> # 4.5
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 17062223fac3..edda47162752 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1624,8 +1624,8 @@ fail: return ret; } -static struct btrfs_root *btrfs_lookup_fs_root(struct btrfs_fs_info *fs_info, - u64 root_id) +struct btrfs_root *btrfs_lookup_fs_root(struct btrfs_fs_info *fs_info, + u64 root_id) { struct btrfs_root *root; |