staging/lustre: Remove OBD_CPT_ALLOC_LARGE

Remove OBD_CPT_ALLOC_LARGE define and convert the only user to
libcfs_kvzalloc_cpt.

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/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index 30f22d97efb3626f85ab25c8cb5773f621a53c7f..b7467632c4a2b2c9a1c4052e7be4698068026b01 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -634,11 +634,6 @@ do {                                                                         \
        ptr = libcfs_kvzalloc(size, GFP_NOFS);                            \
 } while (0)
 
-#define OBD_CPT_ALLOC_LARGE(ptr, cptab, cpt, size)                           \
-do {                                                                         \
-       ptr = libcfs_kvzalloc_cpt(cptab, cpt, size, GFP_NOFS);                \
-} while (0)
-
 #define OBD_FREE_LARGE(ptr, size)                                           \
 do {                                                                     \
        (void)(size);                                                   \

diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
index 003344ccfffcde1d88a43556fa404be11072be36..40de622450eefa74e5b042391dcf5c4923f4b47a 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/service.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
@@ -86,8 +86,10 @@ ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt)
        rqbd->rqbd_cbid.cbid_fn = request_in_callback;
        rqbd->rqbd_cbid.cbid_arg = rqbd;
        INIT_LIST_HEAD(&rqbd->rqbd_reqs);
-       OBD_CPT_ALLOC_LARGE(rqbd->rqbd_buffer, svc->srv_cptable,
-                           svcpt->scp_cpt, svc->srv_buf_size);
+       rqbd->rqbd_buffer = libcfs_kvzalloc_cpt(svc->srv_cptable,
+                                               svcpt->scp_cpt,
+                                               svc->srv_buf_size,
+                                               GFP_KERNEL);
        if (rqbd->rqbd_buffer == NULL) {
                kfree(rqbd);
                return NULL;