Commit 21068c46 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: Replace kmem_cache_alloc with kmem_cache_zalloc 



Use kmem_cache_zalloc instead of manually setting kmem_cache_alloc
with flag GFP_ZERO since kmem_alloc_zalloc sets allocated memory
to zero.

The Coccinelle semantic patch used to make this change is as
follows:
// <smpl>
@@
expression e,f;
@@
- kmem_cache_alloc(e, f |__GFP_ZERO)
+ kmem_cache_zalloc(e, f)
// </smpl>

Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3eed2d00

drivers/staging/lustre/lustre/llite/file.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct ll_file_data *ll_file_data_get(void) 
{

	struct ll_file_data *fd;



	fd = kmem_cache_alloc(ll_file_data_slab, GFP_NOFS | __GFP_ZERO);

	fd = kmem_cache_zalloc(ll_file_data_slab, GFP_NOFS);

	if (!fd)

		return NULL;

	fd->fd_write_failed = false;
@@ -1280,7 +1280,7 @@ static int ll_lov_recreate(struct inode *inode, struct ost_id *oi, u32 ost_idx) 
	int rc = 0;

	struct lov_stripe_md *lsm = NULL, *lsm2;



	oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);

	if (!oa)

		return -ENOMEM;

drivers/staging/lustre/lustre/llite/llite_close.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int ll_som_update(struct inode *inode, struct md_op_data *op_data) 
		       inode->i_ino, inode->i_generation,

		       lli->lli_flags);



	oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);

	if (!oa) {

		CERROR("can't allocate memory for Size-on-MDS update.\n");

		return -ENOMEM;

drivers/staging/lustre/lustre/llite/llite_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -1789,8 +1789,7 @@ int ll_iocontrol(struct inode *inode, struct file *file, 
			return 0;

		}



		oinfo.oi_oa = kmem_cache_alloc(obdo_cachep,

					       GFP_NOFS | __GFP_ZERO);

		oinfo.oi_oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);

		if (!oinfo.oi_oa) {

			ccc_inode_lsm_put(inode, lsm);

			return -ENOMEM;

drivers/staging/lustre/lustre/llite/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ int ll_objects_destroy(struct ptlrpc_request *request, struct inode *dir) 
	}

	LASSERT(rc >= sizeof(*lsm));



	oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);

	if (!oa) {

		rc = -ENOMEM;

		goto out_free_memmd;

drivers/staging/lustre/lustre/llite/remote_perm.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static inline struct ll_remote_perm *alloc_ll_remote_perm(void) 
{

	struct ll_remote_perm *lrp;



	lrp = kmem_cache_alloc(ll_remote_perm_cachep, GFP_KERNEL | __GFP_ZERO);

	lrp = kmem_cache_zalloc(ll_remote_perm_cachep, GFP_KERNEL);

	if (lrp)

		INIT_HLIST_NODE(&lrp->lrp_list);

	return lrp;
@@ -82,7 +82,7 @@ static struct hlist_head *alloc_rmtperm_hash(void) 
	struct hlist_head *hash;

	int i;



	hash = kmem_cache_alloc(ll_rmtperm_hash_cachep, GFP_NOFS | __GFP_ZERO);

	hash = kmem_cache_zalloc(ll_rmtperm_hash_cachep, GFP_NOFS);

	if (!hash)

		return NULL;