Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c

1 files changed, 3 insertions, 7 deletions

diff --git a/fs/coda/cache.c b/fs/coda/cache.c
index 690157876184..958ae0e0ff8c 100644
--- a/fs/coda/cache.c
+++ b/fs/coda/cache.c
@@ -89,17 +89,13 @@ int coda_cache_check(struct inode *inode, int mask)
 /* this won't do any harm: just flag all children */
 static void coda_flag_children(struct dentry *parent, int flag)
 {
-        struct list_head *child;
         struct dentry *de;
 
         spin_lock(&parent->d_lock);
-        list_for_each(child, &parent->d_subdirs)
-        {
-                de = list_entry(child, struct dentry, d_u.d_child);
+        list_for_each_entry(de, &parent->d_subdirs, d_u.d_child) {
                 /* don't know what to do with negative dentries */
-                if ( ! de->d_inode ) 
-                        continue;
-                coda_flag_inode(de->d_inode, flag);
+                if (de->d_inode ) 
+                        coda_flag_inode(de->d_inode, flag);
         }
         spin_unlock(&parent->d_lock);
         return;