Update patch for 867344

This commit is contained in:
Josh Boyer 2012-10-30 13:06:45 -04:00
parent ddc5dcdcdf
commit 8eac4e9c08
1 changed files with 9 additions and 11 deletions

View File

@ -1,21 +1,19 @@
@@ -, +, @@
negative dentry
BUG_ON(!d_unhashed(entry));
fs/cifs/dir.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
cifs_atomic_open
fs/cifs/dir.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/fs/cifs/dir.c
+++ a/fs/cifs/dir.c
@@ -398,7 +398,12 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
@@ -398,6 +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)
+ /* Check for hashed negative dentry. We have already revalidated
+ * the dentry and it is fine. No need to perform another lookup.
+ */
+ if (!d_unhashed(direntry))
+ return -ENOENT;
+
+ res = cifs_lookup(inode, direntry, 0);
struct dentry *res = cifs_lookup(inode, direntry, 0);
if (IS_ERR(res))
return PTR_ERR(res);