diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2015-03-20 19:02:09 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-27 02:10:25 +0100 |
| commit | 727b9784b6085c99c2f836bf4fcc2848dc9cf904 (patch) | |
| tree | 99988b3e636a8168562c9056e87497a651461ee2 /fs | |
| parent | btrfs: explicitly set control file's private_data (diff) | |
| download | linux-727b9784b6085c99c2f836bf4fcc2848dc9cf904.tar.xz linux-727b9784b6085c99c2f836bf4fcc2848dc9cf904.zip | |
btrfs: cleanup orphans while looking up default subvolume
Orphans in the fs tree are cleaned up via open_ctree and subvolume
orphans are cleaned via btrfs_lookup_dentry -- except when a default
subvolume is in use. The name for the default subvolume uses a manual
lookup that doesn't trigger orphan cleanup and needs to trigger it
manually as well. This doesn't apply to the remount case since the
subvolumes are cleaned up by walking the root radix tree.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index eb67ca44ad51..f2c9f9db3b19 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -901,6 +901,15 @@ find_root: if (IS_ERR(new_root)) return ERR_CAST(new_root); + if (!(sb->s_flags & MS_RDONLY)) { + int ret; + down_read(&fs_info->cleanup_work_sem); + ret = btrfs_orphan_cleanup(new_root); + up_read(&fs_info->cleanup_work_sem); + if (ret) + return ERR_PTR(ret); + } + dir_id = btrfs_root_dirid(&new_root->root_item); setup_root: location.objectid = dir_id; |