Attachment 173481 Details for Bug 236875 – Patch to sync autofs4 with upstream

[patch] Patch to sync autofs4 with upstream

autofs4-rhel-5-lookup-check-unhashed.patch (text/plain), 1.27 KB, created by Ian Kent on 2007-08-27 11:43:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-08-27 11:43:00 UTC

Size: 1.27 KB

patch

obsolete

>--- linux-2.6.18.noarch/fs/autofs4/root.c.lookup-check-unhashed	2007-08-22 18:37:11.000000000 +0800
>+++ linux-2.6.18.noarch/fs/autofs4/root.c	2007-08-22 18:42:40.000000000 +0800
>@@ -655,14 +655,29 @@ static struct dentry *autofs4_lookup(str
> 
> 	/*
> 	 * If this dentry is unhashed, then we shouldn't honour this
>-	 * lookup even if the dentry is positive.  Returning ENOENT here
>-	 * doesn't do the right thing for all system calls, but it should
>-	 * be OK for the operations we permit from an autofs.
>+	 * lookup.  Returning ENOENT here doesn't do the right thing
>+	 * for all system calls, but it should be OK for the operations
>+	 * we permit from an autofs.
> 	 */
> 	if (dentry->d_inode && d_unhashed(dentry)) {
>+		/*
>+		 * A user space application can (and has done in the past)
>+		 * remove and re-create this directory during the callback.
>+		 * This can leave us with an unhashed dentry, but a
>+		 * successful mount!  So we need to perform another
>+		 * cached lookup in case the dentry now exists.
>+		 */
>+		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 ERR_PTR(-ENOENT);
>+
>+		return dentry;
> 	}
> 
> 	if (unhashed)

Actions: View | Diff

Attachments on bug 236875: 152877 | 161844 | 173481 | 173501