d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use namei to acquire Giant for VFS if it is necessary. Drop the explicit

Browse Source 
Giant acquisition.
 - Remove GIANT_REQUIRED in the few remaining cases; the vm and vfs have
   both been locked.
This commit is contained in:
jeff 2005-05-03 10:55:05 +00:00
parent 568be2b109
commit cee720b9d9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/kern_exec.c
View File

@ -294,6 +294,7 @@ do_execve(td, args, mac_p)
#endif
struct vnode *textvp = NULL;
int credential_changing;
int vfslocked;
int textset;
#ifdef MAC
struct label *interplabel = NULL;
@ -348,16 +349,16 @@ do_execve(td, args, mac_p)
* in ni_vp amoung other things.
*/
ndp = &nd;
NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME,
NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME | MPSAFE,
UIO_SYSSPACE, args->fname, td);
mtx_lock(&Giant);
interpret:
vfslocked = 0;
error = namei(ndp);
if (error)
goto exec_fail;
vfslocked = NDHASGIANT(ndp);
imgp->vp = ndp->ni_vp;
/*
@ -438,8 +439,9 @@ do_execve(td, args, mac_p)
vput(ndp->ni_vp);
vm_object_deallocate(imgp->object);
imgp->object = NULL;
VFS_UNLOCK_GIANT(vfslocked);
/* set new name to that of the interpreter */
NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME,
NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME | MPSAFE,
UIO_SYSSPACE, imgp->interpreter_name, td);
goto interpret;
}
@ -772,7 +774,7 @@ do_execve(td, args, mac_p)
if (interplabel != NULL)
mac_vnode_label_free(interplabel);
#endif
mtx_unlock(&Giant);
VFS_UNLOCK_GIANT(vfslocked);
return (error);
}
@ -785,8 +787,6 @@ exec_map_first_page(imgp)
vm_page_t ma[VM_INITIAL_PAGEIN];
vm_object_t object;
GIANT_REQUIRED;
if (imgp->firstpage != NULL)
exec_unmap_first_page(imgp);
@ -876,8 +876,6 @@ exec_new_vmspace(imgp, sv)
vm_offset_t stack_addr;
vm_map_t map;
GIANT_REQUIRED;
imgp->vmspace_destroyed = 1;
/* Called with Giant held, do not depend on it! */