(14/19)
shifted conditional mntput() into do_follow_link() - all callers
were doing the same thing.
Obviously equivalent transformation.
Signed-off-by: Al Viro <[email protected]>
----
diff -urN RC12-rc4-13/fs/namei.c RC12-rc4-14/fs/namei.c
--- RC12-rc4-13/fs/namei.c 2005-05-19 16:39:42.545026018 -0400
+++ RC12-rc4-14/fs/namei.c 2005-05-19 16:39:43.660803683 -0400
@@ -543,11 +543,15 @@
current->link_count++;
current->total_link_count++;
nd->depth++;
+ if (path->mnt != nd->mnt)
+ mntput(nd->mnt);
err = __do_follow_link(path, nd);
current->link_count--;
nd->depth--;
return err;
loop:
+ if (path->mnt != nd->mnt)
+ mntput(nd->mnt);
dput(path->dentry);
path_release(nd);
return err;
@@ -801,8 +805,6 @@
goto out_dput;
if (inode->i_op->follow_link) {
- if (nd->mnt != next.mnt)
- mntput(nd->mnt);
err = do_follow_link(&next, nd);
if (err)
goto return_err;
@@ -856,8 +858,6 @@
inode = next.dentry->d_inode;
if ((lookup_flags & LOOKUP_FOLLOW)
&& inode && inode->i_op && inode->i_op->follow_link) {
- if (next.mnt != nd->mnt)
- mntput(nd->mnt);
err = do_follow_link(&next, nd);
if (err)
goto return_err;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
