btrfs: replace opencoded kvzalloc with the helper

The logic of kmalloc and vmalloc fallback is opencoded in
several places, we can now use the existing helper.

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

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 6cabc8acee2a929ad6467f3c8b3a7567d955c61e..5f8006e4de9d72b61838875e40c35f1f04d923f9 100644 (file)
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -94,7 +94,7 @@
 #include <linux/mutex.h>
 #include <linux/genhd.h>
 #include <linux/blkdev.h>
-#include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <linux/string.h>
 #include "ctree.h"
 #include "disk-io.h"
@@ -2920,13 +2920,10 @@ int btrfsic_mount(struct btrfs_fs_info *fs_info,
                       fs_info->sectorsize, PAGE_SIZE);
                return -1;
        }
-       state = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
+       state = kvzalloc(sizeof(*state), GFP_KERNEL);
        if (!state) {
-               state = vzalloc(sizeof(*state));
-               if (!state) {
-                       pr_info("btrfs check-integrity: vzalloc() failed!\n");
-                       return -1;
-               }
+               pr_info("btrfs check-integrity: allocation failed!\n");
+               return -1;
        }
 
        if (!btrfsic_is_initialized) {

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index d8ea0eb76325e9b25d42dfa4a99c63918981aa2f..d68af3c61b49838c84993d4218fc3fe17afc8c3d 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -31,7 +31,7 @@
 #include <linux/hash.h>
 #include <linux/list_sort.h>
 #include <linux/raid/xor.h>
-#include <linux/vmalloc.h>
+#include <linux/mm.h>
 #include <asm/div64.h>
 #include "ctree.h"
 #include "extent_map.h"
@@ -218,12 +218,9 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info)
         * of a failing mount.
         */
        table_size = sizeof(*table) + sizeof(*h) * num_entries;
-       table = kzalloc(table_size, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
-       if (!table) {
-               table = vzalloc(table_size);
-               if (!table)
-                       return -ENOMEM;
-       }
+       table = kvzalloc(table_size, GFP_KERNEL);
+       if (!table)
+               return -ENOMEM;
 
        spin_lock_init(&table->cache_lock);
        INIT_LIST_HEAD(&table->stripe_cache);

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index e8185c83f667f6e471347bbeb415454ffcb451fa..924b1d941b539ebeb788c0c8f6fefbda157bc30e 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6389,13 +6389,10 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
 
        alloc_size = sizeof(struct clone_root) * (arg->clone_sources_count + 1);
 
-       sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN);
+       sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL);
        if (!sctx->clone_roots) {
-               sctx->clone_roots = vzalloc(alloc_size);
-               if (!sctx->clone_roots) {
-                       ret = -ENOMEM;
-                       goto out;
-               }
+               ret = -ENOMEM;
+               goto out;
        }
 
        alloc_size = arg->clone_sources_count * sizeof(*arg->clone_sources);