Commit 49999ab2 authored Oct 11, 2012 by Ian Kent Committed by Linus Torvalds Oct 11, 2012

autofs4 - fix reset pending flag on mount fail



In autofs4_d_automount(), if a mount fail occurs the AUTOFS_INF_PENDING
mount pending flag is not cleared.

One effect of this is when using the "browse" option, directory entry
attributes show up with all "?"s due to the incorrect callback and
subsequent failure return (when in fact no callback should be made).

Signed-off-by: Ian Kent <ikent@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 14ffe009

fs/autofs4/root.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -392,10 +392,12 @@ static struct vfsmount autofs4_d_automount(struct path path)
		ino->flags \|= AUTOFS_INF_PENDING;
		spin_unlock(&sbi->fs_lock);
		status = autofs4_mount_wait(dentry);
		if (status)
		return ERR_PTR(status);
		spin_lock(&sbi->fs_lock);
		ino->flags &= ~AUTOFS_INF_PENDING;
		if (status) {
		spin_unlock(&sbi->fs_lock);
		return ERR_PTR(status);
		}
		}
		done:
		if (!(ino->flags & AUTOFS_INF_EXPIRING)) {

Admin message