coda: replace upc_alloc/upc_free with kmalloc/kfree

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 6818c20372cab45364b7fc873873657ddd00344d..8a09f19596db01054385a86d86959946ae4ff879 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -49,8 +49,6 @@
 
 #include "coda_int.h"
 
-#define upc_free(r) kfree(r)
-
 /* statistics */
 int           coda_hard;         /* allows signals during upcalls */
 unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */
@@ -264,7 +262,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
        }
 
        CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
-       upc_free(req);
+       kfree(req);
 out:
        unlock_kernel();
        return (count ? count : retval);
@@ -320,7 +318,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
                /* Async requests need to be freed here */
                if (req->uc_flags & REQ_ASYNC) {
                        CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
-                       upc_free(req);
+                       kfree(req);
                        continue;
                }
                req->uc_flags |= REQ_ABORT;

diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index ad65ee01790f172e4fb50720c592814b1a06e876..330de7dbdcf8198ece00f63fce8ad1580c534ef4 100644 (file)
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -37,9 +37,6 @@
 #include <linux/coda_cache.h>
 #include <linux/coda_proc.h> 
 
-#define upc_alloc() kmalloc(sizeof(struct upc_req), GFP_KERNEL)
-#define upc_free(r) kfree(r)
-
 static int coda_upcall(struct coda_sb_info *mntinfo, int inSize, int *outSize, 
                       union inputArgs *buffer);
 
@@ -745,7 +742,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
        }
 
        /* Format the request message. */
-       req = upc_alloc();
+       req = kmalloc(sizeof(struct upc_req), GFP_KERNEL);
        if (!req)
                return -ENOMEM;
 
@@ -802,12 +799,12 @@ static int coda_upcall(struct coda_sb_info *sbi,
        }
 
        error = -ENOMEM;
-       sig_req = upc_alloc();
+       sig_req = kmalloc(sizeof(struct upc_req), GFP_KERNEL);
        if (!sig_req) goto exit;
 
        CODA_ALLOC((sig_req->uc_data), char *, sizeof(struct coda_in_hdr));
        if (!sig_req->uc_data) {
-               upc_free(sig_req);
+               kfree(sig_req);
                goto exit;
        }
 
@@ -827,7 +824,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
        wake_up_interruptible(&vcommp->vc_waitq);
 
 exit:
-       upc_free(req);
+       kfree(req);
        return error;
 }