diff options
author | Filipe Manana <fdmanana@suse.com> | 2015-03-02 20:53:52 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-22 17:03:36 -0700 |
commit | 146a4565fa80cb586abcda5575922d5ac71162c9 (patch) | |
tree | 104241384e43ab3b87a2e5cbc8a9e0ac86db440b | |
parent | d5709e641278e6db8186638ccf61741a425cb826 (diff) | |
download | lwn-146a4565fa80cb586abcda5575922d5ac71162c9.tar.gz lwn-146a4565fa80cb586abcda5575922d5ac71162c9.zip |
Btrfs: send, add missing check for dead clone root
commit 5cc2b17e80cf5770f2e585c2d90fd8af1b901258 upstream.
After we locked the root's root item, a concurrent snapshot deletion
call might have set the dead flag on it. So check if the dead flag
is set and abort if it is, just like we do for the parent root.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/btrfs/send.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index d6033f540cc7..6ec28f13659e 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -5855,7 +5855,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) clone_sources_to_rollback = i + 1; spin_lock(&clone_root->root_item_lock); clone_root->send_in_progress++; - if (!btrfs_root_readonly(clone_root)) { + if (!btrfs_root_readonly(clone_root) || + btrfs_root_dead(clone_root)) { spin_unlock(&clone_root->root_item_lock); srcu_read_unlock(&fs_info->subvol_srcu, index); ret = -EPERM; |