From: Josh Triplett <josht@us.ibm.com>
Date: Sun, 30 Jul 2006 10:03:56 +0000 (-0700)
Subject: [PATCH] Remove incorrect unlock_kernel from allocation failure path in coda_open()
X-Git-Tag: v2.6.18-rc4~103
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ecbc4e1a395062a8e99e4f5fe328f6ba166d9c8;p=linux-2.6

[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>
---

diff --git a/fs/coda/file.c b/fs/coda/file.c
index cc66c681bd..dbfbcfa5b3 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();