From: Al Viro <viro@www.linux.org.uk>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org
Subject: [CFR][PATCH] namei fixes (14/19)
Date: Thu, 19 May 2005 23:57:11 +0100 [thread overview]
Message-ID: <E1DYtx1-0007sp-H6@parcelfarce.linux.theplanet.co.uk> (raw)
(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;
reply other threads:[~2005-05-19 23:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1DYtx1-0007sp-H6@parcelfarce.linux.theplanet.co.uk \
--to=viro@www.linux.org.uk \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®