[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>
This commit is contained in:
parent
90ebe5654f
commit
5f92b3bcec
11
fs/namei.c
11
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)
|
static inline int do_follow_link(struct path *path, struct nameidata *nd)
|
||||||
{
|
{
|
||||||
int err = -ELOOP;
|
int err = -ELOOP;
|
||||||
|
mntget(path->mnt);
|
||||||
if (current->link_count >= MAX_NESTED_LINKS)
|
if (current->link_count >= MAX_NESTED_LINKS)
|
||||||
goto loop;
|
goto loop;
|
||||||
if (current->total_link_count >= 40)
|
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);
|
err = __do_follow_link(path->dentry, nd);
|
||||||
current->link_count--;
|
current->link_count--;
|
||||||
nd->depth--;
|
nd->depth--;
|
||||||
|
dput(path->dentry);
|
||||||
|
mntput(path->mnt);
|
||||||
return err;
|
return err;
|
||||||
loop:
|
loop:
|
||||||
path_release(nd);
|
path_release(nd);
|
||||||
|
dput(path->dentry);
|
||||||
|
mntput(path->mnt);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -783,10 +788,7 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
|
||||||
goto out_dput;
|
goto out_dput;
|
||||||
|
|
||||||
if (inode->i_op->follow_link) {
|
if (inode->i_op->follow_link) {
|
||||||
mntget(next.mnt);
|
|
||||||
err = do_follow_link(&next, nd);
|
err = do_follow_link(&next, nd);
|
||||||
dput(next.dentry);
|
|
||||||
mntput(next.mnt);
|
|
||||||
if (err)
|
if (err)
|
||||||
goto return_err;
|
goto return_err;
|
||||||
err = -ENOENT;
|
err = -ENOENT;
|
||||||
|
@ -837,10 +839,7 @@ last_component:
|
||||||
inode = next.dentry->d_inode;
|
inode = next.dentry->d_inode;
|
||||||
if ((lookup_flags & LOOKUP_FOLLOW)
|
if ((lookup_flags & LOOKUP_FOLLOW)
|
||||||
&& inode && inode->i_op && inode->i_op->follow_link) {
|
&& inode && inode->i_op && inode->i_op->follow_link) {
|
||||||
mntget(next.mnt);
|
|
||||||
err = do_follow_link(&next, nd);
|
err = do_follow_link(&next, nd);
|
||||||
dput(next.dentry);
|
|
||||||
mntput(next.mnt);
|
|
||||||
if (err)
|
if (err)
|
||||||
goto return_err;
|
goto return_err;
|
||||||
inode = nd->dentry->d_inode;
|
inode = nd->dentry->d_inode;
|
||||||
|
|
Loading…
Reference in New Issue