[kernel/f17] Fix autofs issue in 3.6 (rhbz 874372)

[Josh Boyer]

commit 46e984b0cc693858bdb08d2cc2fafe2176af2fb2
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Jan 2 10:30:41 2013 -0500

    Fix autofs issue in 3.6 (rhbz 874372)

 don-t-do-blind-d_drop-in-nfs_prime_dcache.patch |   27 +++++++++++++++++++++++
 kernel.spec                                     |    9 ++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/don-t-do-blind-d_drop-in-nfs_prime_dcache.patch b/don-t-do-blind-d_drop-in-nfs_prime_dcache.patch
new file mode 100644
index 0000000..d4e837a
--- /dev/null
+++ b/don-t-do-blind-d_drop-in-nfs_prime_dcache.patch
@@ -0,0 +1,27 @@
+From 696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c Mon Sep 17 00:00:00 2001
+From: Al Viro <viro at zeniv.linux.org.uk>
+Date: Thu, 29 Nov 2012 22:00:51 -0500
+Subject: [PATCH] don't do blind d_drop() in nfs_prime_dcache()
+
+Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
+---
+ fs/nfs/dir.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
+index ce8cb92..99489cf 100644
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -450,7 +450,8 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
+ 			nfs_refresh_inode(dentry->d_inode, entry->fattr);
+ 			goto out;
+ 		} else {
+-			d_drop(dentry);
++			if (d_invalidate(dentry) != 0)
++				goto out;
+ 			dput(dentry);
+ 		}
+ 	}
+-- 
+1.8.0.1
+
diff --git a/kernel.spec b/kernel.spec
index 104b9c6..01eb6ef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -787,6 +787,9 @@ Patch21234: mac80211-fix-ibss-scanning.patch
 #rhbz 873107
 Patch21237: 0001-ACPI-sony-laptop-do-proper-memcpy-for-ACPI_TYPE_INTE.patch
 
+#rhbz 874372
+Patch21238: don-t-do-blind-d_drop-in-nfs_prime_dcache.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1528,6 +1531,9 @@ ApplyPatch mac80211-fix-ibss-scanning.patch
 #rhbz 873107
 ApplyPatch 0001-ACPI-sony-laptop-do-proper-memcpy-for-ACPI_TYPE_INTE.patch
 
+#rhbz 874372
+ApplyPatch don-t-do-blind-d_drop-in-nfs_prime_dcache.patch
+
 
 # END OF PATCH APPLICATIONS
 
@@ -2393,6 +2399,7 @@ fi
 #              '-'
 %changelog
 * Wed Jan 02 2013 Josh Boyer <jwboyer at redhat.com>
+- Fix autofs issue in 3.6 (rhbz 874372)
 - BR the hostname package (rhbz 886113)
 
 * Mon Dec 17 2012 Justin M. Forbes <jforbes at redhat.com>