1 files changed, 8 insertions, 14 deletions

diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index e5ba34818332..8db4b58b2e4b 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -49,14 +49,13 @@ void ocfs2_dentry_attach_gen(struct dentry *dentry)
 }
 
 
-static int ocfs2_dentry_revalidate(struct dentry *dentry,
-                                   struct nameidata *nd)
+static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)
 {
         struct inode *inode;
         int ret = 0;    /* if all else fails, just return false */
         struct ocfs2_super *osb;
 
-        if (nd && nd->flags & LOOKUP_RCU)
+        if (flags & LOOKUP_RCU)
                 return -ECHILD;
 
         inode = dentry->d_inode;
@@ -170,13 +169,11 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,
                                       u64 parent_blkno,
                                       int skip_unhashed)
 {
-        struct list_head *p;
-        struct dentry *dentry = NULL;
+        struct hlist_node *p;
+        struct dentry *dentry;
 
         spin_lock(&inode->i_lock);
-        list_for_each(p, &inode->i_dentry) {
-                dentry = list_entry(p, struct dentry, d_alias);
-
+        hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) {
                 spin_lock(&dentry->d_lock);
                 if (ocfs2_match_dentry(dentry, parent_blkno, skip_unhashed)) {
                         trace_ocfs2_find_local_alias(dentry->d_name.len,
@@ -184,16 +181,13 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,
 
                         dget_dlock(dentry);
                         spin_unlock(&dentry->d_lock);
-                        break;
+                        spin_unlock(&inode->i_lock);
+                        return dentry;
                 }
                 spin_unlock(&dentry->d_lock);
-
-                dentry = NULL;
         }
-
         spin_unlock(&inode->i_lock);
-
-        return dentry;
+        return NULL;
 }
 
 DEFINE_SPINLOCK(dentry_attach_lock);