Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 87556ef19926e97464e0163a7840140527ae6615

Authored by David Howells
Committed by Al Viro
1 parent 1972580bb4
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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
051d381259eb57d6074d02a6ba6e90e744f1a29f, 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>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

... ... @@ -800,12 +800,8 @@
800 800 touch_atime(link->mnt, dentry);
801 801 nd_set_link(nd, NULL);
802 802  
803   - if (link->mnt != nd->path.mnt) {
804   - path_to_nameidata(link, nd);
805   - nd->inode = nd->path.dentry->d_inode;
806   - dget(dentry);
807   - }
808   - mntget(link->mnt);
  803 + if (link->mnt == nd->path.mnt)
  804 + mntget(link->mnt);
809 805  
810 806 nd->last_type = LAST_BIND;
811 807 *p = dentry->d_inode->i_op->follow_link(dentry, nd);