From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Kent Subject: [PATCH] autofs4 - fix direct mount pending expire race - correction Date: Fri, 18 Jul 2008 11:14:54 +0800 Message-ID: <20080718031453.12148.79135.stgit@raven.themaw.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: autofs mailing list , Kernel Mailing List , linux-fsdevel , Al Viro , Linus Torvalds To: Andrew Morton Return-path: Received: from outbound.icp-qv1-irony-out2.iinet.net.au ([203.59.1.107]:43260 "EHLO outbound.icp-qv1-irony-out2.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbYGRDSt (ORCPT ); Thu, 17 Jul 2008 23:18:49 -0400 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Appologies, somehow I seem to have sent an out dated version of this patch. Here is an additional patch that brings the patch up to date. Signed-off-by: Ian Kent --- fs/autofs4/root.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index b1536c1..7a7ed94 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -190,13 +190,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; @@ -208,7 +202,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