提交 da4e0be0 编写于 作者: A Al Viro

link_path_walk: nd->depth massage, part 3

remove decrement/increment surrounding nd_alloc_stack(), adjust the
test in it.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 fd4620bb
...@@ -539,7 +539,7 @@ static int __nd_alloc_stack(struct nameidata *nd) ...@@ -539,7 +539,7 @@ static int __nd_alloc_stack(struct nameidata *nd)
static inline int nd_alloc_stack(struct nameidata *nd) static inline int nd_alloc_stack(struct nameidata *nd)
{ {
if (likely(nd->depth != EMBEDDED_LEVELS - 1)) if (likely(nd->depth != EMBEDDED_LEVELS))
return 0; return 0;
if (likely(nd->stack != nd->internal)) if (likely(nd->stack != nd->internal))
return 0; return 0;
...@@ -1824,9 +1824,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1824,9 +1824,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (err) { if (err) {
const char *s; const char *s;
nd->depth--;
err = nd_alloc_stack(nd); err = nd_alloc_stack(nd);
nd->depth++;
if (unlikely(err)) { if (unlikely(err)) {
path_to_nameidata(&nd->link, nd); path_to_nameidata(&nd->link, nd);
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册