Commit 87556ef1 authored Jan 14, 2011 by David Howells Committed by Al Viro Jan 15, 2011

Remove a further kludge from __do_follow_link()



Remove a further kludge from __do_follow_link() as it's no longer required with
the automount code.

This reverts the non-helper-function parts of
051d3812, which breaks union mounts.

Reported-by:  <vaurora@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 1972580b

fs/namei.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -800,11 +800,7 @@ __do_follow_link(const struct path link, struct nameidata nd, void **p)
		touch_atime(link->mnt, dentry);
		nd_set_link(nd, NULL);

		if (link->mnt != nd->path.mnt) {
		path_to_nameidata(link, nd);
		nd->inode = nd->path.dentry->d_inode;
		dget(dentry);
		}
		if (link->mnt == nd->path.mnt)
		mntget(link->mnt);

		nd->last_type = LAST_BIND;