summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-06-06 13:35:59 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 14:42:24 -0700
commit5f92b3bcec0fa2e2d775b589850097f9dc6b2de2 (patch)
tree239ce9af16392b452f651780e85b40b809b8d17a /fs
parent90ebe5654febe3555a2516d51d3d251226d35fdb (diff)
downloadop-kernel-dev-5f92b3bcec0fa2e2d775b589850097f9dc6b2de2.zip
op-kernel-dev-5f92b3bcec0fa2e2d775b589850097f9dc6b2de2.tar.gz
[PATCH] namei fixes (2/19)
All callers of do_follow_link() do mntget() right before it and dput()+mntput() right after. These calls are moved inside do_follow_link() now. 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.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c
index abeec34..12d75ed 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -526,6 +526,7 @@ static inline int __do_follow_link(struct dentry *dentry, struct nameidata *nd)
static inline int do_follow_link(struct path *path, struct nameidata *nd)
{
int err = -ELOOP;
+ mntget(path->mnt);
if (current->link_count >= MAX_NESTED_LINKS)
goto loop;
if (current->total_link_count >= 40)
@@ -541,9 +542,13 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
err = __do_follow_link(path->dentry, nd);
current->link_count--;
nd->depth--;
+ dput(path->dentry);
+ mntput(path->mnt);
return err;
loop:
path_release(nd);
+ dput(path->dentry);
+ mntput(path->mnt);
return err;
}
@@ -783,10 +788,7 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
goto out_dput;
if (inode->i_op->follow_link) {
- mntget(next.mnt);
err = do_follow_link(&next, nd);
- dput(next.dentry);
- mntput(next.mnt);
if (err)
goto return_err;
err = -ENOENT;
@@ -837,10 +839,7 @@ last_component:
inode = next.dentry->d_inode;
if ((lookup_flags & LOOKUP_FOLLOW)
&& inode && inode->i_op && inode->i_op->follow_link) {
- mntget(next.mnt);
err = do_follow_link(&next, nd);
- dput(next.dentry);
- mntput(next.mnt);
if (err)
goto return_err;
inode = nd->dentry->d_inode;
OpenPOWER on IntegriCloud