lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 66/79] namei: lift (open-coded) terminate_walk() into callers of get_link()
Date
From: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/namei.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 76bf620..f7bce07 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -892,7 +892,6 @@ const char *get_link(struct nameidata *nd)
mntget(nd->link.mnt);

if (unlikely(current->total_link_count >= MAXSYMLINKS)) {
- path_put(&nd->path);
path_put(&nd->link);
return ERR_PTR(-ELOOP);
}
@@ -916,7 +915,6 @@ const char *get_link(struct nameidata *nd)
res = inode->i_op->follow_link(dentry, &last->cookie, nd);
if (IS_ERR(res)) {
out:
- path_put(&nd->path);
path_put(&last->link);
return res;
}
@@ -1819,7 +1817,7 @@ Walked:

if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s);
- goto Err;
+ break;
}
err = 0;
if (unlikely(!s)) {
@@ -1850,7 +1848,6 @@ Walked:
}
}
terminate_walk(nd);
-Err:
while (unlikely(nd->depth))
put_link(nd);
return err;
@@ -1986,8 +1983,10 @@ static int trailing_symlink(struct nameidata *nd)
return error;
nd->flags |= LOOKUP_PARENT;
s = get_link(nd);
- if (unlikely(IS_ERR(s)))
+ if (unlikely(IS_ERR(s))) {
+ terminate_walk(nd);
return PTR_ERR(s);
+ }
if (unlikely(!s))
return 0;
if (*s == '/') {
--
2.1.4


\
 
 \ /
  Last update: 2015-05-05 07:41    [W:0.931 / U:1.588 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site