summaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-10 10:43:46 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-10 22:20:16 -0400
commit6920a4405e6ff7813de4d5a9eb5e0b475e41a06b (patch)
treeebed3fe2c3b616b9793dcf58bbe54c3a20e8ae76 /fs/namei.c
parent6e77137b363b8d866ac29c5a0c95e953614fb2d8 (diff)
downloadlinux-6920a4405e6ff7813de4d5a9eb5e0b475e41a06b.tar.bz2
namei: simplify failure exits in get_link()
when cookie is NULL, put_link() is equivalent to path_put(), so as soon as we'd set last->cookie to NULL, we can bump nd->depth and let the normal logics in terminate_walk() to take care of cleanups. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/namei.c b/fs/namei.c
index f311f0369e3c..678aeef85490 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -904,27 +904,23 @@ const char *get_link(struct nameidata *nd)
last->link = nd->link;
last->cookie = NULL;
+ nd->depth++;
cond_resched();
touch_atime(&last->link);
error = security_inode_follow_link(dentry);
- res = ERR_PTR(error);
if (error)
- goto out;
+ return ERR_PTR(error);
nd->last_type = LAST_BIND;
res = inode->i_link;
if (!res) {
res = inode->i_op->follow_link(dentry, &last->cookie);
- if (IS_ERR(res)) {
-out:
- path_put(&last->link);
- return res;
- }
+ if (IS_ERR_OR_NULL(res))
+ last->cookie = NULL;
}
- nd->depth++;
return res;
}