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
051d381259
, 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>
This commit is contained in:
parent
1972580bb4
commit
87556ef199
|
@ -800,12 +800,8 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
|
||||||
touch_atime(link->mnt, dentry);
|
touch_atime(link->mnt, dentry);
|
||||||
nd_set_link(nd, NULL);
|
nd_set_link(nd, NULL);
|
||||||
|
|
||||||
if (link->mnt != nd->path.mnt) {
|
if (link->mnt == nd->path.mnt)
|
||||||
path_to_nameidata(link, nd);
|
mntget(link->mnt);
|
||||||
nd->inode = nd->path.dentry->d_inode;
|
|
||||||
dget(dentry);
|
|
||||||
}
|
|
||||||
mntget(link->mnt);
|
|
||||||
|
|
||||||
nd->last_type = LAST_BIND;
|
nd->last_type = LAST_BIND;
|
||||||
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
|
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
|
||||||
|
|
Loading…
Reference in New Issue