Commit af13af52 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/llite: Get rid of OBD_ALLOC/FREE_PTR 



The remaining users in ll_open_cleanup and obd_mod_alloc
are converted to regular kzalloc/kfree.

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fca5ba8a

drivers/staging/lustre/lustre/include/obd.h

+2 −2
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static inline struct md_open_data *obd_mod_alloc(void) 
{

	struct md_open_data *mod;



	OBD_ALLOC_PTR(mod);

	mod = kzalloc(sizeof(*mod), GFP_NOFS);

	if (mod == NULL)

		return NULL;

	atomic_set(&mod->mod_refcount, 1);
@@ -1421,7 +1421,7 @@ static inline struct md_open_data *obd_mod_alloc(void) 
	if (atomic_dec_and_test(&(mod)->mod_refcount)) {	  \

		if ((mod)->mod_open_req)			  \

			ptlrpc_req_finished((mod)->mod_open_req);   \

		OBD_FREE_PTR(mod);			      \

		kfree(mod);			      \

	}						       \

})

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

+1 −1
Original line number Diff line number Diff line
@@ -1996,7 +1996,7 @@ void ll_open_cleanup(struct super_block *sb, struct ptlrpc_request *open_req) 
	struct obd_export		*exp	   = ll_s2sbi(sb)->ll_md_exp;



	body = req_capsule_server_get(&open_req->rq_pill, &RMF_MDT_BODY);

	OBD_ALLOC_PTR(op_data);

	op_data = kzalloc(sizeof(*op_data), GFP_NOFS);

	if (!op_data) {

		CWARN("%s: cannot allocate op_data to release open handle for "

		      DFID "\n",