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

namei: don't unlazy until get_link()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-09 13:04:24 -04:00
parent 7973387a2f
commit bc40aee053
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/namei.c
View File

@ -536,10 +536,19 @@ static void restore_nameidata(struct nameidata *old)
static int __nd_alloc_stack(struct nameidata *nd) static int __nd_alloc_stack(struct nameidata *nd)
{ {
struct saved *p = kmalloc(MAXSYMLINKS * sizeof(struct saved), struct saved *p;
if (nd->flags & LOOKUP_RCU) {
p= kmalloc(MAXSYMLINKS * sizeof(struct saved),
GFP_ATOMIC);
if (unlikely(!p))
return -ECHILD;
} else {
p= kmalloc(MAXSYMLINKS * sizeof(struct saved),
GFP_KERNEL); GFP_KERNEL);
if (unlikely(!p)) if (unlikely(!p))
return -ENOMEM; return -ENOMEM;
}
memcpy(p, nd->internal, sizeof(nd->internal)); memcpy(p, nd->internal, sizeof(nd->internal));
nd->stack = p; nd->stack = p;
return 0; return 0;
@ -957,8 +966,10 @@ const char *get_link(struct nameidata *nd)
int error; int error;
const char *res; const char *res;
BUG_ON(nd->flags & LOOKUP_RCU); if (nd->flags & LOOKUP_RCU) {
if (unlikely(unlazy_walk(nd, NULL, 0)))
return ERR_PTR(-ECHILD);
}
cond_resched(); cond_resched();
touch_atime(&last->link); touch_atime(&last->link);
@ -1623,18 +1634,22 @@ static int pick_link(struct nameidata *nd, struct path *link,
path_to_nameidata(link, nd); path_to_nameidata(link, nd);
return -ELOOP; return -ELOOP;
} }
if (nd->flags & LOOKUP_RCU) { if (!(nd->flags & LOOKUP_RCU)) {
if (unlikely(unlazy_link(nd, link, seq)))
return -ECHILD;
} else {
if (link->mnt == nd->path.mnt) if (link->mnt == nd->path.mnt)
mntget(link->mnt); mntget(link->mnt);
} }
error = nd_alloc_stack(nd); error = nd_alloc_stack(nd);
if (unlikely(error)) { if (unlikely(error)) {
if (error == -ECHILD) {
if (unlikely(unlazy_link(nd, link, seq)))
return -ECHILD;
error = nd_alloc_stack(nd);
}
if (error) {
path_put(link); path_put(link);
return error; return error;
} }
}
last = nd->stack + nd->depth++; last = nd->stack + nd->depth++;
last->link = *link; last->link = *link;