From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
remove decrement/increment surrounding nd_alloc_stack(), adjust the
test in it.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
fs/namei.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index d8ad004..0d1fcaf 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -539,7 +539,7 @@ static 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;
if (likely(nd->stack != nd->internal))
return 0;
@@ -1816,9 +1816,7 @@ Walked:
if (err) {
const char *s;
- nd->depth--;
err = nd_alloc_stack(nd);
- nd->depth++;
if (unlikely(err)) {
path_to_nameidata(&nd->link, nd);
break;
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
