diff options
author | Miao Xie <miaox@cn.fujitsu.com> | 2013-05-14 10:20:43 +0000 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-06-14 11:29:36 -0400 |
commit | babbf170c781f24095336c82ebf18ad272ddb773 (patch) | |
tree | cc18313731030bc2f314d103aaf81aa599b1cb17 /fs/btrfs/extent-tree.c | |
parent | dc7f370c05dd024697d4d6c68f91fd04fe8fad1e (diff) | |
download | blackbird-op-linux-babbf170c781f24095336c82ebf18ad272ddb773.tar.gz blackbird-op-linux-babbf170c781f24095336c82ebf18ad272ddb773.zip |
Btrfs: make the snap/subv deletion end more early when the fs is R/O
The snapshot/subvolume deletion might spend lots of time, it would make
the remount task wait for a long time. This patch improve this problem,
we will break the deletion if the fs is remounted to be R/O. It will make
the users happy.
Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index df472ab1b5ac..b55b5fb0eb29 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7384,7 +7384,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, wc->reada_count = BTRFS_NODEPTRS_PER_BLOCK(root); while (1) { - if (!for_reloc && btrfs_fs_closing(root->fs_info)) { + if (!for_reloc && btrfs_need_cleaner_sleep(root)) { pr_debug("btrfs: drop snapshot early exit\n"); err = -EAGAIN; goto out_end_trans; |