btrfs: start orphan cleanup on ro->rw remount (8f1c21d7) · Commits · 戴 / test

When we mount a rw filesystem, we start the orphan cleanup process in tree root and filesystem tree. However, when we remount a ro file system rw, we only clean the former. Move the calls to btrfs_orphan_cleanup() on tree_root and fs_root to the shared rw mount routine to effectively add them on ro->rw remount. Reviewed-by:

Josef Bacik <josef@toxicpanda.com> Signed-off-by:

Boris Burkov <boris@bur.io> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/disk-io.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -2882,6 +2882,14 @@ int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info)
		if (ret)
		goto out;

		down_read(&fs_info->cleanup_work_sem);
		if ((ret = btrfs_orphan_cleanup(fs_info->fs_root)) \|\|
		(ret = btrfs_orphan_cleanup(fs_info->tree_root))) {
		up_read(&fs_info->cleanup_work_sem);
		goto out;
		}
		up_read(&fs_info->cleanup_work_sem);

		mutex_lock(&fs_info->cleaner_mutex);
		ret = btrfs_recover_relocation(fs_info->tree_root);
		mutex_unlock(&fs_info->cleaner_mutex);
		@@ -3374,15 +3382,6 @@ int __cold open_ctree(struct super_block sb, struct btrfs_fs_devices fs_device
		}
		}

		down_read(&fs_info->cleanup_work_sem);
		if ((ret = btrfs_orphan_cleanup(fs_info->fs_root)) \|\|
		(ret = btrfs_orphan_cleanup(fs_info->tree_root))) {
		up_read(&fs_info->cleanup_work_sem);
		close_ctree(fs_info);
		return ret;
		}
		up_read(&fs_info->cleanup_work_sem);

		ret = btrfs_start_pre_rw_mount(fs_info);
		if (ret) {
		close_ctree(fs_info);

Admin message