namei: have terminate_walk() do put_link() on everything left
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:
Родитель
191d7f73e2
Коммит
1543972678
10
fs/namei.c
10
fs/namei.c
|
@ -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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче