lkml.org 
[lkml]   [2015]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 15/21] namei: fold path_cleanup() into terminate_walk()
Date
From: Al Viro <viro@zeniv.linux.org.uk>

they are always called next to each other; moreover,
terminate_walk() is more symmetrical that way.

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

diff --git a/fs/namei.c b/fs/namei.c
index bd45300..59a4662 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -584,6 +584,10 @@ static void terminate_walk(struct nameidata *nd)
path_put(&nd->path);
for (i = 0; i < nd->depth; i++)
path_put(&nd->stack[i].link);
+ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {
+ path_put(&nd->root);
+ nd->root.mnt = NULL;
+ }
} else {
nd->flags &= ~LOOKUP_RCU;
if (!(nd->flags & LOOKUP_ROOT))
@@ -2049,14 +2053,6 @@ static const char *path_init(int dfd, const struct filename *name,
return ERR_PTR(-ECHILD);
}

-static void path_cleanup(struct nameidata *nd)
-{
- if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {
- path_put(&nd->root);
- nd->root.mnt = NULL;
- }
-}
-
static const char *trailing_symlink(struct nameidata *nd)
{
const char *s;
@@ -2112,7 +2108,6 @@ static int path_lookupat(int dfd, const struct filename *name, unsigned flags,
nd->path.dentry = NULL;
}
terminate_walk(nd);
- path_cleanup(nd);
return err;
}

@@ -2160,7 +2155,6 @@ static int path_parentat(int dfd, const struct filename *name,
nd->path.dentry = NULL;
}
terminate_walk(nd);
- path_cleanup(nd);
return err;
}

@@ -2444,7 +2438,6 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path,
}
}
terminate_walk(nd);
- path_cleanup(nd);
return err;
}

@@ -3316,7 +3309,6 @@ static struct file *path_openat(int dfd, struct filename *pathname,
}
}
terminate_walk(nd);
- path_cleanup(nd);
out2:
if (!(opened & FILE_OPENED)) {
BUG_ON(!error);
--
2.1.4


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