lustre: obdclass: Replace uses of OBD_{ALLOC,FREE}_LARGE

Replace uses of OBD_ALLOC_LARGE by libcfs_kvzalloc and OBD_FREE_LARGE by
kvfree.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression ptr,size;
@@

- OBD_ALLOC_LARGE(ptr,size)
+ ptr = libcfs_kvzalloc(size, GFP_NOFS)

@@
expression ptr,size;
@@

- OBD_FREE_LARGE(ptr, size);
+ kvfree(ptr);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c
index eae66066035890f9c4ecdc5ecda085fe5851f622..4d9b6333eeae856af9115a56b6b21357b1cc7e19 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c
+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c
@@ -2121,7 +2121,7 @@ void lu_buf_free(struct lu_buf *buf)
        LASSERT(buf);
        if (buf->lb_buf) {
                LASSERT(buf->lb_len > 0);
-               OBD_FREE_LARGE(buf->lb_buf, buf->lb_len);
+               kvfree(buf->lb_buf);
                buf->lb_buf = NULL;
                buf->lb_len = 0;
        }
@@ -2133,7 +2133,7 @@ void lu_buf_alloc(struct lu_buf *buf, int size)
        LASSERT(buf);
        LASSERT(buf->lb_buf == NULL);
        LASSERT(buf->lb_len == 0);
-       OBD_ALLOC_LARGE(buf->lb_buf, size);
+       buf->lb_buf = libcfs_kvzalloc(size, GFP_NOFS);
        if (likely(buf->lb_buf))
                buf->lb_len = size;
 }
@@ -2171,14 +2171,14 @@ int lu_buf_check_and_grow(struct lu_buf *buf, int len)
        if (len <= buf->lb_len)
                return 0;
 
-       OBD_ALLOC_LARGE(ptr, len);
+       ptr = libcfs_kvzalloc(len, GFP_NOFS);
        if (ptr == NULL)
                return -ENOMEM;
 
        /* Free the old buf */
        if (buf->lb_buf != NULL) {
                memcpy(ptr, buf->lb_buf, buf->lb_len);
-               OBD_FREE_LARGE(buf->lb_buf, buf->lb_len);
+               kvfree(buf->lb_buf);
        }
 
        buf->lb_buf = ptr;

diff --git a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
index 1cfaabfef6e349a2f49114920fb6dc22e22c5e65..35a94a8f4fd36df0af07936f213de805641d7692 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
+++ b/drivers/staging/lustre/lustre/obdclass/lustre_handles.c
@@ -198,7 +198,8 @@ int class_handle_init(void)
 
        LASSERT(handle_hash == NULL);
 
-       OBD_ALLOC_LARGE(handle_hash, sizeof(*bucket) * HANDLE_HASH_SIZE);
+       handle_hash = libcfs_kvzalloc(sizeof(*bucket) * HANDLE_HASH_SIZE,
+                                     GFP_NOFS);
        if (handle_hash == NULL)
                return -ENOMEM;
 
@@ -249,7 +250,7 @@ void class_handle_cleanup(void)
 
        count = cleanup_all_handles();
 
-       OBD_FREE_LARGE(handle_hash, sizeof(*handle_hash) * HANDLE_HASH_SIZE);
+       kvfree(handle_hash);
        handle_hash = NULL;
 
        if (count != 0)