lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull handling of . and .. into inlined helper

Browse Source 
getting LOOKUP_RCU checks out of link_path_walk()...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-03-04 14:22:06 -05:00
parent 7bc055d1d5
commit 9856fa1b28
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/namei.c
View File

@ -1318,6 +1318,18 @@ static inline int may_lookup(struct nameidata *nd)
return exec_permission(nd->inode, 0);
}
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;
} else
follow_dotdot(nd);
}
return 0;
}
/*
* Name resolution.
* This is the basic name resolution function, turning a pathname into
@ -1393,13 +1405,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
* parent relationships.
*/
if (unlikely(type != LAST_NORM)) {
if (type == LAST_DOTDOT) {
if (nd->flags & LOOKUP_RCU) {
if (follow_dotdot_rcu(nd))
return -ECHILD;
} else
follow_dotdot(nd);
}
if (handle_dots(nd, type))
return -ECHILD;
continue;
}
@ -1434,13 +1441,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (lookup_flags & LOOKUP_PARENT)
goto lookup_parent;
if (unlikely(type != LAST_NORM)) {
if (type == LAST_DOTDOT) {
if (nd->flags & LOOKUP_RCU) {
if (follow_dotdot_rcu(nd))
return -ECHILD;
} else
follow_dotdot(nd);
}
if (handle_dots(nd, type))
return -ECHILD;
return 0;
}
err = do_lookup(nd, &this, &next, &inode);