[PATCH] AFFS fix return without releasing BKL

[PATCH] AFFS fix return without releasing BKL

[Dave Hansen]

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

Linus,
This was found by Dan Carpenter <error27@email.com>, using an smatch 
script.  Looks to me like like an error caused during all the BKL 
pushing.  1 more coming...

Not tested (Greg, please don't hurt me :p )
-- 
Dave Hansen
haveblue@us.ibm.com

[-- Attachment #2: affs-bkl_ret-2.5.25-0.patch --]
[-- Type: text/plain, Size: 320 bytes --]

--- linux-2.5.25-clean/fs/affs/namei.c	Thu Jun 20 15:53:49 2002
+++ linux/fs/affs/namei.c	Thu Jul 11 00:15:16 2002
@@ -345,8 +345,10 @@
 	lock_kernel();
 
 	/* WTF??? */
-	if (!dentry->d_inode)
+	if (!dentry->d_inode) {
+		unlock_kernel();
 		return -ENOENT;
+	}
 
 	res = affs_remove_header(dentry);
 	unlock_kernel();

Re: [PATCH] AFFS fix return without releasing BKL

[Roman Zippel]

Hi,

On Thu, 11 Jul 2002, Dave Hansen wrote:

> This was found by Dan Carpenter <error27@email.com>, using an smatch
> script.  Looks to me like like an error caused during all the BKL
> pushing.  1 more coming...

Actually lock_kernel() and the test there can be removed completely.

bye, Roman

Re: [PATCH] AFFS fix return without releasing BKL

[Dave Hansen]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

Roman Zippel wrote:
> Hi,
> 
> On Thu, 11 Jul 2002, Dave Hansen wrote:
> 
>>This was found by Dan Carpenter <error27@email.com>, using an smatch
>>script.  Looks to me like like an error caused during all the BKL
>>pushing.  1 more coming...
> 
> Actually lock_kernel() and the test there can be removed completely.

Patch attached to do just that.

-- 
Dave Hansen
haveblue@us.ibm.com

[-- Attachment #2: affs-bkl_ret-2.5.25-1.patch --]
[-- Type: text/plain, Size: 405 bytes --]

--- linux-2.5.25-clean/fs/affs/namei.c	Thu Jun 20 15:53:49 2002
+++ linux/fs/affs/namei.c	Fri Jul 12 12:05:24 2002
@@ -342,14 +342,7 @@
 	pr_debug("AFFS: rmdir(dir=%u, \"%.*s\")\n", (u32)dir->i_ino,
 		 (int)dentry->d_name.len, dentry->d_name.name);
 
-	lock_kernel();
-
-	/* WTF??? */
-	if (!dentry->d_inode)
-		return -ENOENT;
-
 	res = affs_remove_header(dentry);
-	unlock_kernel();
 	return res;
 }