ocfs2: use list_for_each_entry in ocfs2_find_local_alias()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 5 insertions, 11 deletions

diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index e5ba34818332..a40edc1e1d86 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -170,13 +170,10 @@ struct dentry *ocfs2_find_local_alias(struct inode *inode,
                                       u64 parent_blkno,
                                       int skip_unhashed)
 {
-        struct list_head *p;
-        struct dentry *dentry = NULL;
+        struct dentry *dentry;
 
         spin_lock(&inode->i_lock);
-        list_for_each(p, &inode->i_dentry) {
-                dentry = list_entry(p, struct dentry, d_alias);
-
+        list_for_each_entry(dentry, &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);