Merge branch 'dentry-cleanups' (dcache access cleanups and optimizations)

This branch simplifies and clarifies the dcache lookup, and allows us to
do certain nice optimizations when comparing dentries.  It also cleans
up the interface to __d_lookup_rcu(), especially around passing the
inode information around.

* dentry-cleanups:
  vfs: make it possible to access the dentry hash/len as one 64-bit entry
  vfs: move dentry name length comparison from dentry_cmp() into callers
  vfs: do the careful dentry name access for all dentry_cmp cases
  vfs: remove unnecessary d_unhashed() check from __d_lookup_rcu
  vfs: clean up __d_lookup_rcu() and dentry_cmp() interfaces

1 files changed, 16 insertions, 3 deletions

diff --git a/fs/namei.c b/fs/namei.c
index 709fb2c17b5f..f9e883c1b856 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1144,12 +1144,25 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
          */
         if (nd->flags & LOOKUP_RCU) {
                 unsigned seq;
-                *inode = nd->inode;
-                dentry = __d_lookup_rcu(parent, name, &seq, inode);
+                dentry = __d_lookup_rcu(parent, name, &seq, nd->inode);
                 if (!dentry)
                         goto unlazy;
 
-                /* Memory barrier in read_seqcount_begin of child is enough */
+                /*
+                 * This sequence count validates that the inode matches
+                 * the dentry name information from lookup.
+                 */
+                *inode = dentry->d_inode;
+                if (read_seqcount_retry(&dentry->d_seq, seq))
+                        return -ECHILD;
+
+                /*
+                 * This sequence count validates that the parent had no
+                 * changes while we did the lookup of the dentry above.
+                 *
+                 * The memory barrier in read_seqcount_begin of child is
+                 *  enough, we can use __read_seqcount_retry here.
+                 */
                 if (__read_seqcount_retry(&parent->d_seq, nd->seq))
                         return -ECHILD;
                 nd->seq = seq;