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>
This commit is contained in:

committed by
Linus Torvalds

parent
978752534e
commit
37461e1957
@@ -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;
|
||||
|
Reference in New Issue
Block a user