From 42a2f470efb8c83c13a472c1f6d7afc75e1a6cdd Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Wed, 23 Jul 2008 21:30:28 -0700 Subject: [PATCH] --- yaml --- r: 105473 b: refs/heads/master c: ec6e8c7d3f9073336ec7b2eed3fcda6f922087c3 h: refs/heads/master i: 105471: dd6076418e8746619181b3b0a87240f37fe8caee v: v3 --- [refs] | 2 +- trunk/fs/autofs4/root.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5fa6f6580841..34780afeca5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e60a9ab5f5d314735467752f623072f5b75157a +refs/heads/master: ec6e8c7d3f9073336ec7b2eed3fcda6f922087c3 diff --git a/trunk/fs/autofs4/root.c b/trunk/fs/autofs4/root.c index adbd8559e870..e062ee5a3ed5 100644 --- a/trunk/fs/autofs4/root.c +++ b/trunk/fs/autofs4/root.c @@ -241,13 +241,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) /* Follow down to our covering mount. */ if (!follow_down(&nd->path.mnt, &nd->path.dentry)) goto done; - /* - * We shouldn't need to do this but we have no way - * of knowing what may have been done so try a follow - * just in case. - */ - autofs4_follow_mount(&nd->path.mnt, &nd->path.dentry); - goto done; + goto follow; } spin_unlock(&sbi->fs_lock); goto done; @@ -273,7 +267,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) /* We trigger a mount for almost all flags */ lookup_type = nd->flags & (TRIGGER_FLAGS | TRIGGER_INTENTS); if (!(lookup_type || dentry->d_flags & DCACHE_AUTOFS_PENDING)) - goto done; + goto follow; /* * If the dentry contains directories then it is an autofs