btrfs: hold a ref on the root in create_pending_snapshot

We create the snapshot and then use it for a bunch of things, we need to
hold a ref on it while we're messing with it.

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

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a3223bec3f5b1b22dfac441a5383776a6c517e8e..d5a994ab9602d925d4988168563a6f26158d0db5 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -875,6 +875,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
        d_instantiate(dentry, inode);
        ret = 0;
 fail:
+       btrfs_put_fs_root(pending_snapshot->snap);
        btrfs_subvolume_release_metadata(fs_info, &pending_snapshot->block_rsv);
 dec_and_free:
        if (snapshot_force_cow)

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index e194d3e4e3a9a5196dc1d90a37b80eca471feb9e..7008def3391be58db189180eaacb5e4c87c63f65 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1637,6 +1637,12 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
                btrfs_abort_transaction(trans, ret);
                goto fail;
        }
+       if (!btrfs_grab_fs_root(pending->snap)) {
+               ret = -ENOENT;
+               pending->snap = NULL;
+               btrfs_abort_transaction(trans, ret);
+               goto fail;
+       }
 
        ret = btrfs_reloc_post_snapshot(trans, pending);
        if (ret) {