From 37461e1957e6262278342a0c1a78e46996b7ff88 Mon Sep 17 00:00:00 2001 From: Jan Harkes Date: Thu, 19 Jul 2007 01:48:48 -0700 Subject: coda: replace upc_alloc/upc_free with kmalloc/kfree Signed-off-by: Jan Harkes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/coda/upcall.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'fs/coda/upcall.c') diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index ad65ee01790..330de7dbdcf 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c @@ -37,9 +37,6 @@ #include #include -#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; } -- cgit v1.2.3