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

staging/lustre: Replace last users of OBD_ALLOC/FREE_LARGE 



OBD_ALLOC_LARGE is now replaced with libcfs_kvzalloc and
OBD_FREE_LARGE is now replaced with kvfree.

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

drivers/staging/lustre/lustre/include/lustre_lib.h

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int obd_ioctl_popdata(void *arg, void *data, int len); 


static inline void obd_ioctl_freedata(char *buf, int len)

{

	OBD_FREE_LARGE(buf, len);

	kvfree(buf);

	return;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -728,8 +728,8 @@ static inline void oti_alloc_cookies(struct obd_trans_info *oti, 
	if (num_cookies == 1)

		oti->oti_logcookies = &oti->oti_onecookie;

	else

		OBD_ALLOC_LARGE(oti->oti_logcookies,

				num_cookies * sizeof(oti->oti_onecookie));

		oti->oti_logcookies = libcfs_kvzalloc(num_cookies * sizeof(oti->oti_onecookie),

						      GFP_NOFS);



	oti->oti_numcookies = num_cookies;

}
@@ -742,8 +742,8 @@ static inline void oti_free_cookies(struct obd_trans_info *oti) 
	if (oti->oti_logcookies == &oti->oti_onecookie)

		LASSERT(oti->oti_numcookies == 1);

	else

		OBD_FREE_LARGE(oti->oti_logcookies,

			       oti->oti_numcookies*sizeof(oti->oti_onecookie));

		kvfree(oti->oti_logcookies);



	oti->oti_logcookies = NULL;

	oti->oti_numcookies = 0;

}