From 70291aecc6aa228c1b3bb36a5f3efdb0af636042 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 4 May 2015 07:53:00 -0400 Subject: [PATCH] namei: lift (open-coded) terminate_walk() in follow_dotdot_rcu() into callers follow_dotdot_rcu() does an equivalent of terminate_walk() on failure; shifting it into callers makes for simpler rules and those callers already have terminate_walk() on other failure exits. Signed-off-by: Al Viro --- fs/namei.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index b939f488bc6f..25cd93599ada 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1230,10 +1230,6 @@ static int follow_dotdot_rcu(struct nameidata *nd) return 0; failed: - nd->flags &= ~LOOKUP_RCU; - if (!(nd->flags & LOOKUP_ROOT)) - nd->root.mnt = NULL; - rcu_read_unlock(); return -ECHILD; } @@ -1551,8 +1547,7 @@ static inline int handle_dots(struct nameidata *nd, int type) { if (type == LAST_DOTDOT) { if (nd->flags & LOOKUP_RCU) { - if (follow_dotdot_rcu(nd)) - return -ECHILD; + return follow_dotdot_rcu(nd); } else follow_dotdot(nd); } @@ -1592,8 +1587,12 @@ static int walk_component(struct nameidata *nd, int follow) * to be able to know about the current root directory and * parent relationships. */ - if (unlikely(nd->last_type != LAST_NORM)) - return handle_dots(nd, nd->last_type); + if (unlikely(nd->last_type != LAST_NORM)) { + err = handle_dots(nd, nd->last_type); + if (err) + goto out_err; + return 0; + } err = lookup_fast(nd, &path, &inode); if (unlikely(err)) { if (err < 0) @@ -2981,8 +2980,10 @@ static int do_last(struct nameidata *nd, if (nd->last_type != LAST_NORM) { error = handle_dots(nd, nd->last_type); - if (error) + if (unlikely(error)) { + terminate_walk(nd); return error; + } goto finish_open; } -- 2.39.5