mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
[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>
This commit is contained in:
parent
ba7a4c1a76
commit
4b7b9772e4
1 changed files with 4 additions and 4 deletions
|
@ -543,11 +543,15 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
|
||||||
current->link_count++;
|
current->link_count++;
|
||||||
current->total_link_count++;
|
current->total_link_count++;
|
||||||
nd->depth++;
|
nd->depth++;
|
||||||
|
if (path->mnt != nd->mnt)
|
||||||
|
mntput(nd->mnt);
|
||||||
err = __do_follow_link(path, nd);
|
err = __do_follow_link(path, nd);
|
||||||
current->link_count--;
|
current->link_count--;
|
||||||
nd->depth--;
|
nd->depth--;
|
||||||
return err;
|
return err;
|
||||||
loop:
|
loop:
|
||||||
|
if (path->mnt != nd->mnt)
|
||||||
|
mntput(nd->mnt);
|
||||||
dput(path->dentry);
|
dput(path->dentry);
|
||||||
path_release(nd);
|
path_release(nd);
|
||||||
return err;
|
return err;
|
||||||
|
@ -801,8 +805,6 @@ 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) {
|
||||||
if (nd->mnt != next.mnt)
|
|
||||||
mntput(nd->mnt);
|
|
||||||
err = do_follow_link(&next, nd);
|
err = do_follow_link(&next, nd);
|
||||||
if (err)
|
if (err)
|
||||||
goto return_err;
|
goto return_err;
|
||||||
|
@ -856,8 +858,6 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd)
|
||||||
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) {
|
||||||
if (next.mnt != nd->mnt)
|
|
||||||
mntput(nd->mnt);
|
|
||||||
err = do_follow_link(&next, nd);
|
err = do_follow_link(&next, nd);
|
||||||
if (err)
|
if (err)
|
||||||
goto return_err;
|
goto return_err;
|
||||||
|
|
Loading…
Reference in a new issue