diff options
author | Jan Harkes <jaharkes@cs.cmu.edu> | 2007-07-19 04:48:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:48 -0400 |
commit | 37461e1957e6262278342a0c1a78e46996b7ff88 (patch) | |
tree | 1b4113a24a44e71cae787d51ff59c3fdad78d489 /fs/coda/psdev.c | |
parent | 978752534e94b50c8078b229134a37bad9db88b2 (diff) |
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 @@ | |||
49 | 49 | ||
50 | #include "coda_int.h" | 50 | #include "coda_int.h" |
51 | 51 | ||
52 | #define upc_free(r) kfree(r) | ||
53 | |||
54 | /* statistics */ | 52 | /* statistics */ |
55 | int coda_hard; /* allows signals during upcalls */ | 53 | int coda_hard; /* allows signals during upcalls */ |
56 | unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */ | 54 | 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, | |||
264 | } | 262 | } |
265 | 263 | ||
266 | CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr)); | 264 | CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr)); |
267 | upc_free(req); | 265 | kfree(req); |
268 | out: | 266 | out: |
269 | unlock_kernel(); | 267 | unlock_kernel(); |
270 | return (count ? count : retval); | 268 | return (count ? count : retval); |
@@ -320,7 +318,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file) | |||
320 | /* Async requests need to be freed here */ | 318 | /* Async requests need to be freed here */ |
321 | if (req->uc_flags & REQ_ASYNC) { | 319 | if (req->uc_flags & REQ_ASYNC) { |
322 | CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr)); | 320 | CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr)); |
323 | upc_free(req); | 321 | kfree(req); |
324 | continue; | 322 | continue; |
325 | } | 323 | } |
326 | req->uc_flags |= REQ_ABORT; | 324 | req->uc_flags |= REQ_ABORT; |