btrfs: preallocate path for snapshot creation at ioctl time

We can also preallocate btrfs_path that's used during pending snapshot
creation and avoid another late ENOMEM failure.

Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from commit 8546b570511f428838129c00e701eda481cd7c13)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 0f103c4ea4071ec5015f40c038c657ebced0f3a9..1bea803baf5c824a08b9f0789999254cc8bfea9d 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -661,7 +661,8 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
 
        pending_snapshot->root_item = kzalloc(sizeof(struct btrfs_root_item),
                        GFP_NOFS);
-       if (!pending_snapshot->root_item) {
+       pending_snapshot->path = btrfs_alloc_path();
+       if (!pending_snapshot->root_item || !pending_snapshot->path) {
                ret = -ENOMEM;
                goto free_pending;
        }
@@ -747,6 +748,7 @@ dec_and_free:
                wake_up_atomic_t(&root->will_be_snapshoted);
 free_pending:
        kfree(pending_snapshot->root_item);
+       btrfs_free_path(pending_snapshot->path);
        kfree(pending_snapshot);
 
        return ret;

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 61e11892b560471cf951259b2c2729fbf17e74d2..e77e367137862ed440f751df03773fe2cf525e46 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1354,11 +1354,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        u64 root_flags;
        uuid_le new_uuid;
 
-       path = btrfs_alloc_path();
-       if (!path) {
-               pending->error = -ENOMEM;
-               return 0;
-       }
+       ASSERT(pending->path);
+       path = pending->path;
 
        ASSERT(pending->root_item);
        new_root_item = pending->root_item;
@@ -1583,6 +1580,8 @@ no_free_objectid:
        kfree(new_root_item);
        pending->root_item = NULL;
        btrfs_free_path(path);
+       pending->path = NULL;
+
        return ret;
 }
 

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index c0137cc3664d20030261b292b6aafd7687cd4574..e725d053396c8b6b7d99fef91cfe5323b3e31608 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -139,6 +139,7 @@ struct btrfs_pending_snapshot {
        struct btrfs_root_item *root_item;
        struct btrfs_root *snap;
        struct btrfs_qgroup_inherit *inherit;
+       struct btrfs_path *path;
        /* block reservation for the operation */
        struct btrfs_block_rsv block_rsv;
        u64 qgroup_reserved;