diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-18 20:09:08 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:19:56 -0400 |
| commit | 48c8b0c57176ba081c13abdca8334b9d88c4e4d6 (patch) | |
| tree | ef70bfa28a3dbc7a717d62a08c8911c8421e1fa8 | |
| parent | link_path_walk: turn inner loop into explicit goto (diff) | |
| download | linux-dev-48c8b0c57176ba081c13abdca8334b9d88c4e4d6.tar.xz linux-dev-48c8b0c57176ba081c13abdca8334b9d88c4e4d6.zip | |
link_path_walk: massage a bit more
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>
| -rw-r--r-- | fs/namei.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c index 6a0dd0782c7d..b7ba71889afb 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1803,6 +1803,8 @@ loop: /* will be gone very soon */ if (unlikely(!s)) { /* jumped */ put_link(nd, &link, cookie); + current->link_count--; + nd->depth--; } else { if (*s == '/') { if (!nd->root.mnt) @@ -1816,18 +1818,23 @@ loop: /* will be gone very soon */ err = link_path_walk(s, nd); if (unlikely(err)) { put_link(nd, &link, cookie); + current->link_count--; + nd->depth--; + return err; } else { err = walk_component(nd, LOOKUP_FOLLOW); put_link(nd, &link, cookie); - if (err > 0) + current->link_count--; + nd->depth--; + if (err < 0) + return err; + if (err > 0) { + current->link_count++; + nd->depth++; goto loop; + } } } - - current->link_count--; - nd->depth--; - if (err) - return err; } if (!d_can_lookup(nd->path.dentry)) { err = -ENOTDIR; |