btrfs: let callers of btrfs_alloc_root pass gfp flags

We don't need to use GFP_NOFS in all contexts, eg. during mount or for
dummy root tree, but we might for the the log tree creation.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 4545e2e2ad45a556113eecf30b1a7d49ee7ca260..40690e90beee964363aa674b375a8be03012b411 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1296,9 +1296,10 @@ static void __setup_root(u32 nodesize, u32 sectorsize, u32 stripesize,
        spin_lock_init(&root->root_item_lock);
 }
 
-static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info)
+static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info,
+               gfp_t flags)
 {
-       struct btrfs_root *root = kzalloc(sizeof(*root), GFP_NOFS);
+       struct btrfs_root *root = kzalloc(sizeof(*root), flags);
        if (root)
                root->fs_info = fs_info;
        return root;
@@ -1310,7 +1311,7 @@ struct btrfs_root *btrfs_alloc_dummy_root(void)
 {
        struct btrfs_root *root;
 
-       root = btrfs_alloc_root(NULL);
+       root = btrfs_alloc_root(NULL, GFP_KERNEL);
        if (!root)
                return ERR_PTR(-ENOMEM);
        __setup_root(4096, 4096, 4096, root, NULL, 1);
@@ -1332,7 +1333,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
        int ret = 0;
        uuid_le uuid;
 
-       root = btrfs_alloc_root(fs_info);
+       root = btrfs_alloc_root(fs_info, GFP_KERNEL);
        if (!root)
                return ERR_PTR(-ENOMEM);
 
@@ -1408,7 +1409,7 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,
        struct btrfs_root *tree_root = fs_info->tree_root;
        struct extent_buffer *leaf;
 
-       root = btrfs_alloc_root(fs_info);
+       root = btrfs_alloc_root(fs_info, GFP_NOFS);
        if (!root)
                return ERR_PTR(-ENOMEM);
 
@@ -1506,7 +1507,7 @@ static struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,
        if (!path)
                return ERR_PTR(-ENOMEM);
 
-       root = btrfs_alloc_root(fs_info);
+       root = btrfs_alloc_root(fs_info, GFP_NOFS);
        if (!root) {
                ret = -ENOMEM;
                goto alloc_fail;
@@ -2385,7 +2386,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
                return -EIO;
        }
 
-       log_tree_root = btrfs_alloc_root(fs_info);
+       log_tree_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
        if (!log_tree_root)
                return -ENOMEM;
 
@@ -2510,8 +2511,8 @@ int open_ctree(struct super_block *sb,
        int backup_index = 0;
        int max_active;
 
-       tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info);
-       chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info);
+       tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
+       chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info, GFP_KERNEL);
        if (!tree_root || !chunk_root) {
                err = -ENOMEM;
                goto fail;
@@ -2622,7 +2623,7 @@ int open_ctree(struct super_block *sb,
        INIT_LIST_HEAD(&fs_info->ordered_roots);
        spin_lock_init(&fs_info->ordered_root_lock);
        fs_info->delayed_root = kmalloc(sizeof(struct btrfs_delayed_root),
-                                       GFP_NOFS);
+                                       GFP_KERNEL);
        if (!fs_info->delayed_root) {
                err = -ENOMEM;
                goto fail_iput;