summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-06-06 13:36:10 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 14:42:26 -0700
commit4b7b9772e4c3d87e649d4c419d2487aacf1235aa (patch)
tree943427ad8ef5ed51ab0802cf81f5c0e721fb36c6 /fs
parentba7a4c1a76f56c607560f1676680ff491747bdae (diff)
downloadop-kernel-dev-4b7b9772e4c3d87e649d4c419d2487aacf1235aa.zip
op-kernel-dev-4b7b9772e4c3d87e649d4c419d2487aacf1235aa.tar.gz
[PATCH] namei fixes (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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 5153f57..411bb32 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -543,11 +543,15 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
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 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
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 @@ last_component:
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;
OpenPOWER on IntegriCloud