[ARM] Fix pci export warnings

[linux-2.6-omap-h63xx.git] / fs / autofs4 / expire.c

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index b8ce02607d66bacd03d60acad9b99ffd9e48d7d2..8dbd44f10e9dbec10775834ae40480c1d4b98232 100644 (file)
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -174,6 +174,12 @@ static int autofs4_tree_busy(struct vfsmount *mnt,
                        struct autofs_info *ino = autofs4_dentry_ino(p);
                        unsigned int ino_count = atomic_read(&ino->count);
 
+                       /*
+                        * Clean stale dentries below that have not been
+                        * invalidated after a mount fail during lookup
+                        */
+                       d_invalidate(p);
+
                        /* allow for dget above and top is already dgot */
                        if (p == top)
                                ino_count += 2;
@@ -370,8 +376,7 @@ next:
                DPRINTK("returning %p %.*s",
                        expired, (int)expired->d_name.len, expired->d_name.name);
                spin_lock(&dcache_lock);
-               list_del(&expired->d_parent->d_subdirs);
-               list_add(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
+               list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
                spin_unlock(&dcache_lock);
                return expired;
        }