LU-6030 ldiskfs: further cleanup patches of ldiskfs

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel7 / ext4-lookup-dotdot.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel7/ext4-lookup-dotdot.patch b/ldiskfs/kernel_patches/patches/rhel7/ext4-lookup-dotdot.patch
index f4318c5..4b9e658 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel7/ext4-lookup-dotdot.patch
+++ b/ldiskfs/kernel_patches/patches/rhel7/ext4-lookup-dotdot.patch
@@ -2,15 +2,16 @@ Index: linux-3.10.9-200.fc17.x86_64/fs/ext4/namei.c
 ===================================================================
 --- linux-3.10.9-200.fc17.x86_64.orig/fs/ext4/namei.c
 +++ linux-3.10.9-200.fc17.x86_64/fs/ext4/namei.c
-@@ -1438,6 +1438,32 @@ static struct dentry *ext4_lookup(struct
+@@ -1438,6 +1438,33 @@ static struct dentry *ext4_lookup(struct
                        return ERR_PTR(-EIO);
                }
        }
 +      /* ".." shouldn't go into dcache to preserve dcache hierarchy
 +       * otherwise we'll get parent being a child of actual child.
 +       * see bug 10458 for details -bzzz */
-+      if (inode && (dentry->d_name.name[0] == '.' && (dentry->d_name.len == 1 ||
-+              (dentry->d_name.len == 2 && dentry->d_name.name[1] == '.')))) {
++      if (inode && (dentry->d_name.name[0] == '.' &&
++                    (dentry->d_name.len == 1 || (dentry->d_name.len == 2 &&
++                                           dentry->d_name.name[1] == '.')))) {
 +              struct dentry *goal = NULL;
 +
 +              /* first, look for an existing dentry - any one is good */