提交 727b9784 编写于 作者: J Jeff Mahoney 提交者: Chris Mason

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: NJeff Mahoney <jeffm@suse.com>
Reviewed-by: NDavid Sterba <dsterba@suse.cz>
Signed-off-by: NChris Mason <clm@fb.com>
上级 d8620958
...@@ -901,6 +901,15 @@ static struct dentry *get_default_root(struct super_block *sb, ...@@ -901,6 +901,15 @@ static struct dentry *get_default_root(struct super_block *sb,
if (IS_ERR(new_root)) if (IS_ERR(new_root))
return ERR_CAST(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); dir_id = btrfs_root_dirid(&new_root->root_item);
setup_root: setup_root:
location.objectid = dir_id; location.objectid = dir_id;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册