[PATCH v3 057/110] get_link: nd->depth massage, part 6

From: Al Viro
Date: Mon May 11 2015 - 14:28:10 EST


From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

make get_link() increment nd->depth on successful exit

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
fs/namei.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 5753f46..93b5f73 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -918,8 +918,10 @@ const char *get_link(struct nameidata *nd)
out:
path_put(&nd->path);
path_put(&last->link);
+ return res;
}
}
+ nd->depth++;
return res;
}

@@ -1830,11 +1832,9 @@ Walked:
}

s = get_link(nd);
- nd->depth++;

if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s);
- nd->depth--;
goto Err;
}
err = 0;
@@ -2009,7 +2009,6 @@ static int trailing_symlink(struct nameidata *nd)
s = get_link(nd);
if (unlikely(IS_ERR(s)))
return PTR_ERR(s);
- nd->depth++;
if (unlikely(!s)) {
nd->depth--;
return 0;
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/