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 068/110] namei: have terminate_walk() do put_link() on everything left
Date
From: Al Viro <viro@zeniv.linux.org.uk>

All callers of terminate_walk() are followed by more or less
open-coded eqiuvalent of "do put_link() on everything left
in nd->stack". Better done in terminate_walk() itself, and
when we go for RCU symlink traversal we'll have to do it
there anyway.

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

diff --git a/fs/namei.c b/fs/namei.c
index 26466fb..31da717 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1562,6 +1562,8 @@ static void terminate_walk(struct nameidata *nd)
nd->root.mnt = NULL;
rcu_read_unlock();
}
+ while (unlikely(nd->depth))
+ put_link(nd);
}

/*
@@ -1856,8 +1858,6 @@ Walked:
}
}
terminate_walk(nd);
- while (unlikely(nd->depth))
- put_link(nd);
return err;
OK:
if (!nd->depth) /* called from path_init(), done */
@@ -2374,8 +2374,6 @@ done:
error = 0;
out:
terminate_walk(nd);
- if (nd->depth)
- put_link(nd);
return error;
}

@@ -2978,8 +2976,6 @@ static int do_last(struct nameidata *nd,
error = handle_dots(nd, nd->last_type);
if (unlikely(error)) {
terminate_walk(nd);
- if (nd->depth)
- put_link(nd);
return error;
}
goto finish_open;
@@ -3176,8 +3172,6 @@ out:
mnt_drop_write(nd->path.mnt);
path_put(&save_parent);
terminate_walk(nd);
- if (nd->depth)
- put_link(nd);
return error;

exit_dput:
--
2.1.4


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