aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Shilong <wangsl.fnst@cn.fujitsu.com>2014-01-07 04:25:18 -0500
committerChris Mason <clm@fb.com>2014-01-28 16:20:21 -0500
commit896c14f97f700aec6565154f2451605d7c5ce3ed (patch)
treee06e881dda7ae4ec1329f0ddd4e9be1c201f0bbc
parenta88998f291fc707f18ee42ae45220a3a3e384c27 (diff)
Btrfs: fix wrong send_in_progress accounting
Steps to reproduce: # mkfs.btrfs -f /dev/sda8 # mount /dev/sda8 /mnt # btrfs sub snapshot -r /mnt /mnt/snap1 # btrfs sub snapshot -r /mnt /mnt/snap2 # btrfs send /mnt/snap1 -p /mnt/snap2 -f /mnt/1 # dmesg The problem is that we will sort clone roots(include @send_root), it might push @send_root before thus @send_root's @send_in_progress will be decreased twice. Cc: David Sterba <dsterba@suse.cz> Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com> Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/send.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index bff0b1ac3be7..5b6978516461 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -4752,6 +4752,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
4752 u32 i; 4752 u32 i;
4753 u64 *clone_sources_tmp = NULL; 4753 u64 *clone_sources_tmp = NULL;
4754 int clone_sources_to_rollback = 0; 4754 int clone_sources_to_rollback = 0;
4755 int sort_clone_roots = 0;
4755 4756
4756 if (!capable(CAP_SYS_ADMIN)) 4757 if (!capable(CAP_SYS_ADMIN))
4757 return -EPERM; 4758 return -EPERM;
@@ -4942,6 +4943,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
4942 sort(sctx->clone_roots, sctx->clone_roots_cnt, 4943 sort(sctx->clone_roots, sctx->clone_roots_cnt,
4943 sizeof(*sctx->clone_roots), __clone_root_cmp_sort, 4944 sizeof(*sctx->clone_roots), __clone_root_cmp_sort,
4944 NULL); 4945 NULL);
4946 sort_clone_roots = 1;
4945 4947
4946 ret = send_subvol(sctx); 4948 ret = send_subvol(sctx);
4947 if (ret < 0) 4949 if (ret < 0)
@@ -4957,11 +4959,19 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
4957 } 4959 }
4958 4960
4959out: 4961out:
4960 for (i = 0; sctx && i < clone_sources_to_rollback; i++) 4962 if (sort_clone_roots) {
4961 btrfs_root_dec_send_in_progress(sctx->clone_roots[i].root); 4963 for (i = 0; i < sctx->clone_roots_cnt; i++)
4964 btrfs_root_dec_send_in_progress(
4965 sctx->clone_roots[i].root);
4966 } else {
4967 for (i = 0; sctx && i < clone_sources_to_rollback; i++)
4968 btrfs_root_dec_send_in_progress(
4969 sctx->clone_roots[i].root);
4970
4971 btrfs_root_dec_send_in_progress(send_root);
4972 }
4962 if (sctx && !IS_ERR_OR_NULL(sctx->parent_root)) 4973 if (sctx && !IS_ERR_OR_NULL(sctx->parent_root))
4963 btrfs_root_dec_send_in_progress(sctx->parent_root); 4974 btrfs_root_dec_send_in_progress(sctx->parent_root);
4964 btrfs_root_dec_send_in_progress(send_root);
4965 4975
4966 kfree(arg); 4976 kfree(arg);
4967 vfree(clone_sources_tmp); 4977 vfree(clone_sources_tmp);