diff options
| author | Jan Harkes <jaharkes@cs.cmu.edu> | 2007-07-19 01:48:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 10:04:48 -0700 |
| commit | 37461e1957e6262278342a0c1a78e46996b7ff88 (patch) | |
| tree | 1b4113a24a44e71cae787d51ff59c3fdad78d489 /fs/coda/psdev.c | |
| parent | 978752534e94b50c8078b229134a37bad9db88b2 (diff) | |
| download | talos-obmc-linux-37461e1957e6262278342a0c1a78e46996b7ff88.tar.gz talos-obmc-linux-37461e1957e6262278342a0c1a78e46996b7ff88.zip | |
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>
Diffstat (limited to 'fs/coda/psdev.c')
| -rw-r--r-- | fs/coda/psdev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index 6818c20372ca..8a09f19596db 100644 --- 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; |
