rpms/kernel/devel autofs-fix-link_count-usage.patch, NONE, 1.1 kernel.spec, 1.1983, 1.1984

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9505

Modified Files:
	kernel.spec 
Added Files:
	autofs-fix-link_count-usage.patch 
Log Message:
* Mon May 10 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.49.rc7.git0
- autofs: Patch from Ian Kent to fix non-top level mounts. (rhbz#583483)


autofs-fix-link_count-usage.patch:
 root.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE autofs-fix-link_count-usage.patch ---
autofs4-2.6.34-rc1 - fix link_count usage

From: Ian Kent <raven at themaw.net>

Following the commit below in 2.6.34-rc1 autofs direct mounts stop
working. This is caused by current->link_count being 0 when
->follow_link() is called from do_filp_open().

I can't work out why this hasn't been seen before Als patch series.

This patch removes the autofs dependence on current->link_count.

1f36f774b22a0ceb7dd33eca626746c81a97b6a5 is the first bad commit
commit 1f36f774b22a0ceb7dd33eca626746c81a97b6a5
Author: Al Viro <viro at zeniv.linux.org.uk>
Date:   Sat Dec 26 10:56:19 2009 -0500

    Switch !O_CREAT case to use of do_last()

    ... and now we have all intents crap well localized

    Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

:040000 040000 53c1effc5b22746bb83cdbc6a419bf898067882d 9606f7275fde188a056fd174aa1d622ac0630893 M	fs

Signed-off-by: Ian Kent <raven at themaw.net>
---

 fs/autofs4/root.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 109a6c6..e8e5e63 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -177,8 +177,7 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags)
 		}
 	/* Trigger mount for path component or follow link */
 	} else if (ino->flags & AUTOFS_INF_PENDING ||
-			autofs4_need_mount(flags) ||
-			current->link_count) {
+			autofs4_need_mount(flags)) {
 		DPRINTK("waiting for mount name=%.*s",
 			dentry->d_name.len, dentry->d_name.name);
 
@@ -262,7 +261,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
 		spin_unlock(&dcache_lock);
 		spin_unlock(&sbi->fs_lock);
 
-		status = try_to_fill_dentry(dentry, 0);
+		status = try_to_fill_dentry(dentry, nd->flags);
 		if (status)
 			goto out_error;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -p -r1.1983 -r1.1984
--- kernel.spec	10 May 2010 02:39:33 -0000	1.1983
+++ kernel.spec	10 May 2010 14:29:57 -0000	1.1984
@@ -699,6 +699,8 @@ Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-cantiga-iommu-gfx.patch
 
+Patch1024: autofs-fix-link_count-usage.patch
+
 Patch1515: lirc-2.6.33.patch
 Patch1517: hdpvr-ir-enable.patch
 
@@ -1201,6 +1203,7 @@ ApplyPatch linux-2.6-execshield.patch
 #
 # bugfixes to drivers and filesystems
 #
+ApplyPatch autofs-fix-link_count-usage.patch
 
 # ext4
 
@@ -2016,6 +2019,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon May 10 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.49.rc7.git0
+- autofs: Patch from Ian Kent to fix non-top level mounts. (rhbz#583483)
+
 * Sun May 09 2010 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.34-rc7