Automatic merge with /usr/src/ntfs-2.6.git.

1 files changed, 13 insertions, 2 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 3765c047f157..2a771ec66956 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -205,7 +205,11 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
                 struct vfsmount *fp_mnt = mntget(mnt);
                 struct dentry *fp_dentry = dget(dentry);
 
-                while (follow_down(&fp_mnt, &fp_dentry) && d_mountpoint(fp_dentry));
+                if (!autofs4_follow_mount(&fp_mnt, &fp_dentry)) {
+                        dput(fp_dentry);
+                        mntput(fp_mnt);
+                        return -ENOENT;
+                }
 
                 fp = dentry_open(fp_dentry, fp_mnt, file->f_flags);
                 status = PTR_ERR(fp);
@@ -302,7 +306,14 @@ static int try_to_fill_dentry(struct dentry *dentry,
                 
                 DPRINTK("expire done status=%d", status);
                 
-                return 0;
+                /*
+                 * If the directory still exists the mount request must
+                 * continue otherwise it can't be followed at the right
+                 * time during the walk.
+                 */
+                status = d_invalidate(dentry);
+                if (status != -EBUSY)
+                        return 0;
         }
 
         DPRINTK("dentry=%p %.*s ino=%p",