(11/19)
shifted conditional mntput() calls in __link_path_walk() downstream.
Obviously equivalent transformation.
Signed-off-by: Al Viro <[email protected]>
----
diff -urN RC12-rc4-10/fs/namei.c RC12-rc4-11/fs/namei.c
--- RC12-rc4-10/fs/namei.c 2005-05-19 16:39:39.207691029 -0400
+++ RC12-rc4-11/fs/namei.c 2005-05-19 16:39:40.320469292 -0400
@@ -791,8 +791,6 @@
break;
/* Check mountpoints.. */
__follow_mount(&next);
- if (nd->mnt != next.mnt)
- mntput(nd->mnt);
err = -ENOENT;
inode = next.dentry->d_inode;
@@ -803,6 +801,8 @@
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;
@@ -815,6 +815,8 @@
break;
} else {
dput(nd->dentry);
+ if (nd->mnt != next.mnt)
+ mntput(nd->mnt);
nd->mnt = next.mnt;
nd->dentry = next.dentry;
}
@@ -851,17 +853,19 @@
if (err)
break;
__follow_mount(&next);
- if (nd->mnt != next.mnt)
- mntput(nd->mnt);
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;
inode = nd->dentry->d_inode;
} else {
dput(nd->dentry);
+ if (nd->mnt != next.mnt)
+ mntput(nd->mnt);
nd->mnt = next.mnt;
nd->dentry = next.dentry;
}
@@ -901,6 +905,8 @@
return 0;
out_dput:
dput(next.dentry);
+ if (nd->mnt != next.mnt)
+ mntput(nd->mnt);
break;
}
path_release(nd);
-
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]
