]> err.no Git - linux-2.6/commitdiff
[PATCH] Remove incorrect unlock_kernel from allocation failure path in coda_open()
authorJosh Triplett <josht@us.ibm.com>
Sun, 30 Jul 2006 10:03:56 +0000 (03:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Jul 2006 20:28:41 +0000 (13:28 -0700)
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>
fs/coda/file.c

index cc66c681bd11069d993f086db77198f8ba978dfb..dbfbcfa5b3c064855f377949a9470bd6aab63a2e 100644 (file)
@@ -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();