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

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

autofs4: fix direct mount pending expire race - correction 



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: default avatarIan Kent <raven@themaw.net>
Cc: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e60a9ab

fs/autofs4/root.c

+2 −8
Original line number Diff line number Diff line
@@ -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