From 2cf9926874eb8af38feb516a6175ecb7daee54c0 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Oct 22 2012 20:23:50 +0000
Subject: Merge branch 'f18' of ssh://pkgs.fedoraproject.org/kernel into f18


---

diff --git a/dont-call-cifs_lookup-on-hashed-negative-dentry.patch b/dont-call-cifs_lookup-on-hashed-negative-dentry.patch
new file mode 100644
index 0000000..88b35e2
--- /dev/null
+++ b/dont-call-cifs_lookup-on-hashed-negative-dentry.patch
@@ -0,0 +1,21 @@
+@@ -, +, @@ 
+ negative dentry
+    BUG_ON(!d_unhashed(entry));
+ fs/cifs/dir.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+--- a/fs/cifs/dir.c	
++++ a/fs/cifs/dir.c	
+@@ -398,7 +398,12 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
+ 	 * in network traffic in the other paths.
+ 	 */
+ 	if (!(oflags & O_CREAT)) {
+-		struct dentry *res = cifs_lookup(inode, direntry, 0);
++		struct dentry *res;
++
++		if (!direntry->d_inode)
++			return -ENOENT;
++
++		res = cifs_lookup(inode, direntry, 0);
+ 		if (IS_ERR(res))
+ 			return PTR_ERR(res);
+ 
diff --git a/kernel.spec b/kernel.spec
index a5c8cd4..6f77317 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -776,6 +776,9 @@ Patch22075: rt2x00-usb-fix-reset-resume.patch
 #rhbz 862877 864824 CVE-2012-0957
 Patch22076: fix-stack-memory-content-leak-via-UNAME26.patch
 
+#rhbz 867344
+Patch22077: dont-call-cifs_lookup-on-hashed-negative-dentry.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1502,6 +1505,9 @@ ApplyPatch rt2x00-usb-fix-reset-resume.patch
 #rhbz 862877 864824 CVE-2012-0957
 ApplyPatch fix-stack-memory-content-leak-via-UNAME26.patch
 
+#rhbz 867344
+ApplyPatch dont-call-cifs_lookup-on-hashed-negative-dentry.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2358,6 +2364,7 @@ fi
 - VIFO fails on ARM at the moment so disable it for the time being
 
 * Mon Oct 22 2012 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix CIFS oops from Jeff Layton (rhbz 867344)
 - CVE-2012-0957: uts: stack memory leak in UNAME26 (rhbz 862877 864824)
 - Fix rt2x00 usb reset resume (rhbz 856863)