lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 56/79] trailing_symlink: nd->depth massage, part 5
Date
From: Al Viro <viro@zeniv.linux.org.uk>

move increment of ->depth to the point where we'd discovered
that get_link() has not returned an error, adjust exits
accordingly.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/namei.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 800cf7e..51bcbec 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2001,8 +2001,11 @@ static int trailing_symlink(struct nameidata *nd)
s = get_link(nd);
if (unlikely(IS_ERR(s)))
return PTR_ERR(s);
- if (unlikely(!s))
+ nd->depth++;
+ if (unlikely(!s)) {
+ nd->depth--;
return 0;
+ }
if (*s == '/') {
if (!nd->root.mnt)
set_root(nd);
@@ -2012,12 +2015,14 @@ static int trailing_symlink(struct nameidata *nd)
nd->flags |= LOOKUP_JUMPED;
}
nd->inode = nd->path.dentry->d_inode;
- nd->depth++;
error = link_path_walk(s, nd);
- nd->depth--;
- if (unlikely(error))
+ if (unlikely(error)) {
+ nd->depth--;
put_link(nd);
- return error;
+ return error;
+ }
+ nd->depth--;
+ return 0;
}

static inline int lookup_last(struct nameidata *nd)
--
2.1.4


\
 
 \ /
  Last update: 2015-05-05 07:41    [W:0.489 / U:2.660 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site