Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44938af6 authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

[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: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be3ca7fe

fs/autofs4/root.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}



	/*