aboutsummaryrefslogtreecommitdiff
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro2020-01-14 13:07:57 -0500
committerAl Viro2020-03-13 21:08:18 -0400
commit40fcf5a931af901198fcfb23a50354e54e1fa7a6 (patch)
treea063857b5ab2c4d4c4e3ba38a7c8eb328f663196 /fs/namei.c
parent1ccac622f9da58a113f9c5b8c9d07d76b60bc555 (diff)
merging pick_link() with get_link(), part 3
After a pure jump ("/" or procfs-style symlink) we don't need to hold the link anymore. link_path_walk() dropped it if such case had been detected, lookup_last/do_last() (i.e. old trailing_symlink()) left it on the stack - it ended up calling terminate_walk() shortly anyway, which would've purged the entire stack. Do it in get_link() itself instead. Simpler logics that way... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 9678bb2179e6..f844378ce908 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1154,7 +1154,9 @@ const char *get_link(struct nameidata *nd)
} else {
res = get(dentry, inode, &last->done);
}
- if (IS_ERR_OR_NULL(res))
+ if (!res)
+ goto all_done;
+ if (IS_ERR(res))
return res;
}
if (*res == '/') {
@@ -1164,9 +1166,11 @@ const char *get_link(struct nameidata *nd)
while (unlikely(*++res == '/'))
;
}
- if (!*res)
- res = NULL;
- return res;
+ if (*res)
+ return res;
+all_done: // pure jump
+ put_link(nd);
+ return NULL;
}
/*
@@ -2211,11 +2215,7 @@ OK:
if (IS_ERR(s))
return PTR_ERR(s);
- err = 0;
- if (unlikely(!s)) {
- /* jumped */
- put_link(nd);
- } else {
+ if (likely(s)) {
nd->stack[nd->depth - 1].name = name;
name = s;
continue;