Commit 131637b8 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: lustre: replace OBDO_ALLOC with kmem_cache_alloc 



Use direct call to kmem_cache_alloc instead of wrapping macro

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4490ff89

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

+1 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,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;



	OBDO_ALLOC(oa);

	oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	if (oa == NULL)

		return -ENOMEM;

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

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

		       lli->lli_flags);



	OBDO_ALLOC(oa);

	oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	if (!oa) {

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

		return -ENOMEM;

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

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

		}



		OBDO_ALLOC(oinfo.oi_oa);

		oinfo.oi_oa = kmem_cache_alloc(obdo_cachep,

					       GFP_NOFS | __GFP_ZERO);

		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
@@ -903,7 +903,7 @@ int ll_objects_destroy(struct ptlrpc_request *request, struct inode *dir) 
	}

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



	OBDO_ALLOC(oa);

	oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	if (oa == NULL) {

		rc = -ENOMEM;

		goto out_free_memmd;

drivers/staging/lustre/lustre/lov/lov_request.c

+7 −4
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int common_attr_done(struct lov_request_set *set) 
	if (!atomic_read(&set->set_success))

		return -EIO;



	OBDO_ALLOC(tmp_oa);

	tmp_oa = kmem_cache_alloc(obdo_cachep, GFP_NOFS | __GFP_ZERO);

	if (tmp_oa == NULL) {

		rc = -ENOMEM;

		goto out;
@@ -309,7 +309,8 @@ int lov_prep_getattr_set(struct obd_export *exp, struct obd_info *oinfo, 
		req->rq_stripe = i;

		req->rq_idx = loi->loi_ost_idx;



		OBDO_ALLOC(req->rq_oi.oi_oa);

		req->rq_oi.oi_oa = kmem_cache_alloc(obdo_cachep,

						    GFP_NOFS | __GFP_ZERO);

		if (req->rq_oi.oi_oa == NULL) {

			kfree(req);

			rc = -ENOMEM;
@@ -391,7 +392,8 @@ int lov_prep_destroy_set(struct obd_export *exp, struct obd_info *oinfo, 
		req->rq_stripe = i;

		req->rq_idx = loi->loi_ost_idx;



		OBDO_ALLOC(req->rq_oi.oi_oa);

		req->rq_oi.oi_oa = kmem_cache_alloc(obdo_cachep,

						    GFP_NOFS | __GFP_ZERO);

		if (req->rq_oi.oi_oa == NULL) {

			kfree(req);

			rc = -ENOMEM;
@@ -506,7 +508,8 @@ int lov_prep_setattr_set(struct obd_export *exp, struct obd_info *oinfo, 
		req->rq_stripe = i;

		req->rq_idx = loi->loi_ost_idx;



		OBDO_ALLOC(req->rq_oi.oi_oa);

		req->rq_oi.oi_oa = kmem_cache_alloc(obdo_cachep,

						    GFP_NOFS | __GFP_ZERO);

		if (req->rq_oi.oi_oa == NULL) {

			kfree(req);

			rc = -ENOMEM;