From: Al Viro <v...@zeniv.linux.org.uk>
If we get ERR_PTR() from get_link(), we are guaranteed to get err != 0
when we break out of do-while, so we are going to hit if (err) return err;
shortly after it. Pull that into the if (IS_ERR(s)) body.
Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
---
fs/namei.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/namei.c b/fs/namei.c
index 48b2f17..6e6630c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1849,7 +1849,9 @@ static int link_path_walk(const char *name, struct
nameidata *nd)
if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s);
- break;
+ nd->link_count--;
+ nd->depth--;
+ return err;
}
err = 0;
if (likely(s)) {
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
