Messages in this thread Patch in this message | | | From | Al Viro <> | Subject | [PATCH 13/24] link_path_walk: massage a bit more | Date | Mon, 20 Apr 2015 19:12:57 +0100 |
| |
From: Al Viro <viro@zeniv.linux.org.uk>
Pull the block after the if-else in the end of what used to be do-while body into all branches there. We are almost done with the massage...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- fs/namei.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c index 86d54e5..06f1aa3 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1860,6 +1860,8 @@ l: if (unlikely(!s)) { /* jumped */ put_link(nd, &link, cookie); + nd->link_count--; + nd->depth--; } else { if (*s == '/') { if (!nd->root.mnt) @@ -1873,18 +1875,23 @@ l: err = link_path_walk(s, nd); if (unlikely(err)) { put_link(nd, &link, cookie); + nd->link_count--; + nd->depth--; + return err; } else { err = walk_component(nd, &next, LOOKUP_FOLLOW); put_link(nd, &link, cookie); - if (err > 0) + nd->link_count--; + nd->depth--; + if (err < 0) + return err; + if (err > 0) { + nd->link_count++; + nd->depth++; goto l; + } } } - - nd->link_count--; - nd->depth--; - if (err) - return err; } if (!d_can_lookup(nd->path.dentry)) { err = -ENOTDIR; -- 2.1.4
| |