Commit c0a2472f authored Sep 16, 2015 by Oleg Drokin Committed by Greg Kroah-Hartman Sep 16, 2015

staging/lustre: Remove references to OBD_ALLOC/FREE* in comments



Since everything is now supposed to use regular kernel alloc and
free functions.

Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d37c8781

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -453,7 +453,7 @@ static inline void obd_ioctl_freedata(char *buf, int len)
		* __wake_up_common(q, ...); (2.2)
		* spin_unlock(&q->lock, flags); (2.3)
		*
		* OBD_FREE_PTR(obj); (3)
		* kfree(obj); (3)
		*
		* As l_wait_event() may "short-cut" execution and return without taking
		* wait-queue spin-lock, some additional synchronization is necessary to

drivers/staging/lustre/lustre/include/lustre_net.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ union ptlrpc_async_args {
		/**
		* Scratchpad for passing args to completion interpreter. Users
		* cast to the struct of their choosing, and CLASSERT that this is
		* big enough. For _tons_ of context, OBD_ALLOC a struct and store
		* big enough. For _tons_ of context, kmalloc a struct and store
		* a pointer to it here. The pointer_arg ensures this struct is at
		* least big enough for that.
		*/

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -694,7 +694,7 @@ int ll_file_open(struct inode inode, struct file file)
		if (rc) {
		if (och_p && *och_p) {
		kfree(*och_p);
		och_p = NULL; / OBD_FREE writes some magic there */
		*och_p = NULL;
		(*och_usecount)--;
		}
		mutex_unlock(&lli->lli_och_mutex);

drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1223,7 +1223,7 @@ int lprocfs_wr_evict_client(struct file file, const char __user buffer,
		return -ENOMEM;

		/*
		* OBD_ALLOC() will zero kbuf, but we only copy BUFLEN - 1
		* kzalloc() will zero kbuf, but we only copy BUFLEN - 1
		* bytes into kbuf, to ensure that the string is NUL-terminated.
		* UUID_MAX should include a trailing NUL already.
		*/