korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 12:34:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

namei: have terminate_walk() do put_link() on everything left

Browse Source 
All callers of terminate_walk() are followed by more or less
open-coded eqiuvalent of "do put_link() on everything left
in nd->stack".  Better done in terminate_walk() itself, and
when we go for RCU symlink traversal we'll have to do it
there anyway.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-04 08:34:59 -04:00
parent 191d7f73e2
commit 1543972678
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/namei.c
View File

@ -1562,6 +1562,8 @@ static void terminate_walk(struct nameidata *nd)
nd->root.mnt = NULL;
rcu_read_unlock();
}
while (unlikely(nd->depth))
put_link(nd);
}
/*
@ -1856,8 +1858,6 @@ Walked:
}
}
terminate_walk(nd);
while (unlikely(nd->depth))
put_link(nd);
return err;
OK:
if (!nd->depth) /* called from path_init(), done */
@ -2374,8 +2374,6 @@ done:
error = 0;
out:
terminate_walk(nd);
if (nd->depth)
put_link(nd);
return error;
}
@ -2978,8 +2976,6 @@ static int do_last(struct nameidata *nd,
error = handle_dots(nd, nd->last_type);
if (unlikely(error)) {
terminate_walk(nd);
if (nd->depth)
put_link(nd);
return error;
}
goto finish_open;
@ -3176,8 +3172,6 @@ out:
mnt_drop_write(nd->path.mnt);
path_put(&save_parent);
terminate_walk(nd);
if (nd->depth)
put_link(nd);
return error;
exit_dput: