aboutsummaryrefslogtreecommitdiff
path: root/fs/coda/file.c
diff options
context:
space:
mode:
authorJosh Triplett <josht@us.ibm.com>2006-07-30 03:03:56 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-31 13:28:41 -0700
commit6ecbc4e1a395062a8e99e4f5fe328f6ba166d9c8 (patch)
tree860b84b861fb6b96a3ffac777ad806f89a7c9e34 /fs/coda/file.c
parent3ae192080cb4d007792d13522efa98ebe7f15475 (diff)
downloadlinux-linaro-6ecbc4e1a395062a8e99e4f5fe328f6ba166d9c8.tar.gz
[PATCH] Remove incorrect unlock_kernel from allocation failure path in coda_open()
Commit 398c53a757702e1e3a7a2c24860c7ad26acb53ed (in the historical GIT tree) moved the lock_kernel() in coda_open after the allocation of a coda_file_info struct, but left an unlock_kernel() in the allocation failure error path; remove it. Signed-off-by: Josh Triplett <josh@freedesktop.org> Acked-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/coda/file.c')
-rw-r--r--fs/coda/file.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/coda/file.c b/fs/coda/file.c
index cc66c681bd1..dbfbcfa5b3c 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -136,10 +136,8 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
coda_vfs_stat.open++;
cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL);
- if (!cfi) {
- unlock_kernel();
+ if (!cfi)
return -ENOMEM;
- }
lock_kernel();