From: Ian Kent Date: Fri, 29 Sep 2006 09:00:54 +0000 (-0700) Subject: [PATCH] autofs4: pending flag not cleared on mount fail X-Git-Tag: v2.6.19-rc1~720 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=44938af6e08580514abce8bea23ae1c034ea0b1d;p=linux-2.6-omap-h63xx.git [PATCH] autofs4: pending flag not cleared on mount fail During testing I've found that the mount pending flag can be left set at exit from autofs4_lookup after a failed mount request. This shouldn't be allowed to happen and causes incorrect error returns. Signed-off-by: Ian Kent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 0ec24835239..563ef9d7da9 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -281,9 +281,6 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags) DPRINTK("mount done status=%d", status); - if (status && dentry->d_inode) - return status; /* Try to get the kernel to invalidate this dentry */ - /* Turn this into a real negative dentry? */ if (status == -ENOENT) { spin_lock(&dentry->d_lock); @@ -540,6 +537,9 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s return ERR_PTR(-ERESTARTNOINTR); } } + spin_lock(&dentry->d_lock); + dentry->d_flags &= ~DCACHE_AUTOFS_PENDING; + spin_unlock(&dentry->d_lock); } /*