lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 077/110] namei: simplify failure exits in get_link()
Date
From: Al Viro <viro@zeniv.linux.org.uk>

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>
---
fs/namei.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index f311f03..678aeef 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;
}

--
2.1.4


\
 
 \ /
  Last update: 2015-05-11 21:01    [W:0.744 / U:23.432 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site