Attachment 173241 Details for Bug 248126 – Patch to sync autofs4 with upstream

[patch] Patch to sync autofs4 with upstream

autofs4-rhel-4-lookup-expire-race-fix-3.patch (text/plain), 1.28 KB, created by Ian Kent on 2007-08-27 05:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-08-27 05:49:31 UTC

Size: 1.28 KB

patch

obsolete

>--- linux-2.6.9/fs/autofs4/root.c.lookup-expire-race-fix-3	2007-08-27 13:16:07.000000000 +0800
>+++ linux-2.6.9/fs/autofs4/root.c	2007-08-27 13:19:04.000000000 +0800
>@@ -567,7 +567,6 @@ static struct dentry *autofs4_lookup(str
> 	struct autofs_sb_info *sbi;
> 	struct dentry *unhashed;
> 	int oz_mode;
>-	struct dentry *parent = dentry->d_parent;
> 
> 	DPRINTK("name = %.*s",
> 		dentry->d_name.len, dentry->d_name.name);
>@@ -660,9 +659,6 @@ static struct dentry *autofs4_lookup(str
> 	 * be OK for the operations we permit from an autofs.
> 	 */
> 	if (dentry->d_inode && d_unhashed(dentry)) {
>-		struct dentry *new;
>-		if (unhashed)
>-			dput(unhashed);
> 		/*
> 		 *  In the case of replicated server entries, if a mount
> 		 *  attempt fails, the daemon will remove the directory and
>@@ -670,9 +666,17 @@ static struct dentry *autofs4_lookup(str
> 		 *  but a successful mount!  As such, we perform another
> 		 *  cache lookup for the dentry here.
> 		 */
>-		if ((new = d_lookup(parent, &dentry->d_name)) != NULL)
>-			return new;
>-		return ERR_PTR(-ENOENT);
>+		struct dentry *parent = dentry->d_parent;
>+		struct dentry *new = d_lookup(parent, &dentry->d_name);
>+		if (new != NULL)
>+			dentry = new;
>+		else
>+			dentry = ERR_PTR(-ENOENT);
>+
>+		if (unhashed)
>+			dput(unhashed);
>+
>+		return dentry;
> 	}
> 
> 	if (unhashed)

Actions: View | Diff

Attachments on bug 248126: 161833 | 161841 | 173241 | 173261