aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/autofs4/root.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index adbd8559e870..e062ee5a3ed5 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -241,13 +241,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
241 /* Follow down to our covering mount. */ 241 /* Follow down to our covering mount. */
242 if (!follow_down(&nd->path.mnt, &nd->path.dentry)) 242 if (!follow_down(&nd->path.mnt, &nd->path.dentry))
243 goto done; 243 goto done;
244 /* 244 goto follow;
245 * We shouldn't need to do this but we have no way
246 * of knowing what may have been done so try a follow
247 * just in case.
248 */
249 autofs4_follow_mount(&nd->path.mnt, &nd->path.dentry);
250 goto done;
251 } 245 }
252 spin_unlock(&sbi->fs_lock); 246 spin_unlock(&sbi->fs_lock);
253 goto done; 247 goto done;
@@ -273,7 +267,7 @@ cont:
273 /* We trigger a mount for almost all flags */ 267 /* We trigger a mount for almost all flags */
274 lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS); 268 lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS);
275 if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING)) 269 if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING))
276 goto done; 270 goto follow;
277 271
278 /* 272 /*
279 * If the dentry contains directories then it is an autofs 273 * If the dentry contains directories then it is an autofs