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>

diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h
index 2a4294d41b5a0a5ab25d2fa1494f3181c014f3b5..352e5244e68670cc15c29df5e3a1ce860656b9ae 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_lib.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lib.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index 3b6a2d7759b4811ebcfc4b75f1680be2bc8b29d8..c9c21d289e92fd670345825d1d3869e1741c1996 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -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.
         */

diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index b6100325723db11800f067aab87e64acc23a6b31..31ed2487377b22bea956b6905c90e1ad8beb8901 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -694,7 +694,7 @@ out_och_free:
        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);

diff --git a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
index 84eb3da5a9c98e6e1fc55cf8d5d093779ea3eb8d..9a10baf711b099bbd0fdd1d133beeafa4a17b19d 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
@@ -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.
         */