staging: lustre: improve some libcfs_kvzalloc calls.

Using vmalloc with GFP_NOFS is not supported as vmalloc
performs some internal allocations with GFP_KERNEL.

So in cases where the size passed to libcfs_kvzalloc()
is clearly at most 1 page, convert to kzalloc().
In cases where the call clearly doesn't hold any
filesystem locks, convert to GFP_KERNEL.

Unfortunately there are many more that are not easy to fix.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index 09e3a49990793374bd83542ae147a08f4c105b33..d10d27268323dc083a5ca9e2150aa3801c460749 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -1497,7 +1497,7 @@ out_quotactl:
                if (totalsize >= MDS_MAXREQSIZE / 3)
                        return -E2BIG;
 
-               hur = libcfs_kvzalloc(totalsize, GFP_NOFS);
+               hur = kzalloc(totalsize, GFP_NOFS);
                if (!hur)
                        return -ENOMEM;
 

diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index 4aad2e3319481011111ec4497b183c884ac22a8d..002a56793e89ba8acaadca76390401689ab800b7 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -1318,7 +1318,7 @@ static int ll_lov_setea(struct inode *inode, struct file *file,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       lump = libcfs_kvzalloc(lum_size, GFP_NOFS);
+       lump = kzalloc(lum_size, GFP_NOFS);
        if (!lump)
                return -ENOMEM;
 
@@ -2998,7 +2998,7 @@ static int ll_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 
        num_bytes = sizeof(*fiemap) + (extent_count *
                                       sizeof(struct fiemap_extent));
-       fiemap = libcfs_kvzalloc(num_bytes, GFP_NOFS);
+       fiemap = kvzalloc(num_bytes, GFP_KERNEL);
        if (!fiemap)
                return -ENOMEM;
 

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index 5b1122c408fbe9554e1a7426815c9533a9e37e26..f8967fd4436391eab83eed97b27935f26a3cd6e1 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -180,7 +180,7 @@ int obd_ioctl_getdata(char **buf, int *len, void __user *arg)
         * obdfilter-survey is an example, which relies on ioctl. So we'd
         * better avoid vmalloc on ioctl path. LU-66
         */
-       *buf = libcfs_kvzalloc(hdr.ioc_len, GFP_NOFS);
+       *buf = libcfs_kvzalloc(hdr.ioc_len, GFP_KERNEL);
        if (!*buf) {
                CERROR("Cannot allocate control buffer of len %d\n",
                       hdr.ioc_len);

diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c
index 934f067adb1407ab927597cfd73b0fbe9c5e53cc..ed310696a95da676da84d79fc7dbbc40700a84df 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/llog.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog.c
@@ -155,7 +155,7 @@ int llog_init_handle(const struct lu_env *env, struct llog_handle *handle,
        LASSERT(!handle->lgh_hdr);
 
        LASSERT(chunk_size >= LLOG_MIN_CHUNK_SIZE);
-       llh = libcfs_kvzalloc(sizeof(*llh), GFP_NOFS);
+       llh = libcfs_kvzalloc(sizeof(*llh), GFP_KERNEL);
        if (!llh)
                return -ENOMEM;
        handle->lgh_hdr = llh;

diff --git a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
index 2d6da2431a09e175a10204bbe7a9224e7e0c136d..9a6377502ae4521bef9f545cd4d6780139a47e2e 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
+++ b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
@@ -185,7 +185,7 @@ int class_handle_init(void)
        LASSERT(!handle_hash);
 
        handle_hash = libcfs_kvzalloc(sizeof(*bucket) * HANDLE_HASH_SIZE,
-                                     GFP_NOFS);
+                                     GFP_KERNEL);
        if (!handle_hash)
                return -ENOMEM;
 

diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c
index 3d689d6100bc1f9ead3b3ce34d441cb6c9906a51..781462621d92c359abc2363d3eb293eb50c55507 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -544,10 +544,10 @@ int ptlrpc_add_rqs_to_pool(struct ptlrpc_request_pool *pool, int num_rq)
                struct lustre_msg *msg;
 
                spin_unlock(&pool->prp_lock);
-               req = ptlrpc_request_cache_alloc(GFP_NOFS);
+               req = ptlrpc_request_cache_alloc(GFP_KERNEL);
                if (!req)
                        return i;
-               msg = libcfs_kvzalloc(size, GFP_NOFS);
+               msg = libcfs_kvzalloc(size, GFP_KERNEL);
                if (!msg) {
                        ptlrpc_request_cache_free(req);
                        return i;