mm: remove the pgprot argument to __vmalloc

[mirror_ubuntu-hirsute-kernel.git] / fs / gfs2 / dir.c

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index c3f7732415be821253704aa893aace2f110ef033..c0f2875c946c9cdb0f601768876bcaa43afbe733 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -354,7 +354,7 @@ static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip)
 
        hc = kmalloc(hsize, GFP_NOFS | __GFP_NOWARN);
        if (hc == NULL)
-               hc = __vmalloc(hsize, GFP_NOFS, PAGE_KERNEL);
+               hc = __vmalloc(hsize, GFP_NOFS);
 
        if (hc == NULL)
                return ERR_PTR(-ENOMEM);
@@ -1166,7 +1166,7 @@ static int dir_double_exhash(struct gfs2_inode *dip)
 
        hc2 = kmalloc_array(hsize_bytes, 2, GFP_NOFS | __GFP_NOWARN);
        if (hc2 == NULL)
-               hc2 = __vmalloc(hsize_bytes * 2, GFP_NOFS, PAGE_KERNEL);
+               hc2 = __vmalloc(hsize_bytes * 2, GFP_NOFS);
 
        if (!hc2)
                return -ENOMEM;
@@ -1327,7 +1327,7 @@ static void *gfs2_alloc_sort_buffer(unsigned size)
        if (size < KMALLOC_MAX_SIZE)
                ptr = kmalloc(size, GFP_NOFS | __GFP_NOWARN);
        if (!ptr)
-               ptr = __vmalloc(size, GFP_NOFS, PAGE_KERNEL);
+               ptr = __vmalloc(size, GFP_NOFS);
        return ptr;
 }
 
@@ -1987,8 +1987,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
 
        ht = kzalloc(size, GFP_NOFS | __GFP_NOWARN);
        if (ht == NULL)
-               ht = __vmalloc(size, GFP_NOFS | __GFP_NOWARN | __GFP_ZERO,
-                              PAGE_KERNEL);
+               ht = __vmalloc(size, GFP_NOFS | __GFP_NOWARN | __GFP_ZERO);
        if (!ht)
                return -ENOMEM;