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

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

autofs4-2.6.34-rc1 - fix link_count usage 



After commit 1f36f774 ("Switch !O_CREAT case to use of do_last()") in
2.6.34-rc1 autofs direct mounts stopped working.  This is caused by
current->link_count being 0 when ->follow_link() is called from
do_filp_open().

I can't work out why this hasn't been seen before Als patch series.

This patch removes the autofs dependence on current->link_count.

Signed-off-by: default avatarIan Kent <raven@themaw.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b77b907f

fs/autofs4/root.c

+2 −3
Original line number Diff line number Diff line
@@ -177,8 +177,7 @@ static int try_to_fill_dentry(struct dentry *dentry, int flags) 
		}

	/* Trigger mount for path component or follow link */

	} else if (ino->flags & AUTOFS_INF_PENDING ||

			autofs4_need_mount(flags) ||

			current->link_count) {

			autofs4_need_mount(flags)) {

		DPRINTK("waiting for mount name=%.*s",

			dentry->d_name.len, dentry->d_name.name);
@@ -262,7 +261,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 
		spin_unlock(&dcache_lock);

		spin_unlock(&sbi->fs_lock);



		status = try_to_fill_dentry(dentry, 0);

		status = try_to_fill_dentry(dentry, nd->flags);

		if (status)

			goto out_error;