openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
NeilBrown 2018-02-20 13:23:37 +11:00 committed by Greg Kroah-Hartman
parent c23d6d0e54
commit 033085ff96
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/llite/dir.c
View File

@ -1497,7 +1497,7 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (totalsize >= MDS_MAXREQSIZE / 3)
return -E2BIG;
hur = libcfs_kvzalloc(totalsize, GFP_NOFS);
hur = kzalloc(totalsize, GFP_NOFS);
if (!hur)
return -ENOMEM;

4
drivers/staging/lustre/lustre/llite/file.c
View File

@ -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;

2
drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
View File

@ -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);

2
drivers/staging/lustre/lustre/obdclass/llog.c
View File

@ -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;

2
drivers/staging/lustre/lustre/obdclass/lustre_handles.c
View File

@ -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;

4
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -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;