* [CFR][PATCH] namei fixes (14/19)
@ 2005-05-19 22:57 Al Viro
0 siblings, 0 replies; only message in thread
From: Al Viro @ 2005-05-19 22:57 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm
(14/19)
shifted conditional mntput() into do_follow_link() - all callers
were doing the same thing.
Obviously equivalent transformation.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-05-19 23:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-05-19 22:57 [CFR][PATCH] namei fixes (14/19) Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®