leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

take RCU-dependent stuff around exec_permission() into a new helper

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-02-21 21:34:47 -05:00
parent c9c6cac0c2
commit 52094c8a06
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/namei.c
View File

@ -1322,6 +1322,18 @@ fail:
return PTR_ERR(dentry);
}
static inline int may_lookup(struct nameidata *nd)
{
if (nd->flags & LOOKUP_RCU) {
int err = exec_permission(nd->inode, IPERM_FLAG_RCU);
if (err != -ECHILD)
return err;
if (nameidata_drop_rcu(nd))
return -ECHILD;
}
return exec_permission(nd->inode, 0);
}
/*
* Name resolution.
* This is the basic name resolution function, turning a pathname into
@ -1352,17 +1364,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
unsigned int c;
nd->flags |= LOOKUP_CONTINUE;
if (nd->flags & LOOKUP_RCU) {
err = exec_permission(nd->inode, IPERM_FLAG_RCU);
if (err == -ECHILD) {
if (nameidata_drop_rcu(nd))
return -ECHILD;
goto exec_again;
}
} else {
exec_again:
err = exec_permission(nd->inode, 0);
}
err = may_lookup(nd);
if (err)
break;