[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1431367690-5223-54-git-send-email-viro@ZenIV.linux.org.uk>
Date: Mon, 11 May 2015 19:07:14 +0100
From: Al Viro <viro@...IV.linux.org.uk>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Neil Brown <neilb@...e.de>, Christoph Hellwig <hch@...radead.org>,
linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: [PATCH v3 054/110] link_path_walk: nd->depth massage, part 3
From: Al Viro <viro@...iv.linux.org.uk>
remove decrement/increment surrounding nd_alloc_stack(), adjust the
test in it.
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
fs/namei.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index a403425..3df4731 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;
@@ -1824,9 +1824,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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists