diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-03-21 14:46:54 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-03-21 14:46:54 +0000 |
| commit | d5292812f8e33bfe8b587464813610f8ff0195fa (patch) | |
| tree | 47ca50989ad80f668223455cf06e32ee01fb2529 /sys/kern/kern_shutdown.c | |
| parent | 30b3274fff1ed1a025f729cd86c98b6005d94501 (diff) | |
| download | src-d5292812f8e33bfe8b587464813610f8ff0195fa.tar.gz src-d5292812f8e33bfe8b587464813610f8ff0195fa.zip | |
Remove Giant from init creation and vfs_mountroot.
Sponsored by: Netflix
Discussed with: kib@, mckusick@
Differential Review: https://reviews.freebsd.org/D14712
Notes
Notes:
svn path=/head/; revision=331294
Diffstat (limited to 'sys/kern/kern_shutdown.c')
| -rw-r--r-- | sys/kern/kern_shutdown.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 71d4484782fe..e5ea9644ad3f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -268,13 +268,10 @@ sys_reboot(struct thread *td, struct reboot_args *uap) if (error == 0) error = priv_check(td, PRIV_REBOOT); if (error == 0) { - if (uap->opt & RB_REROOT) { + if (uap->opt & RB_REROOT) error = kern_reroot(); - } else { - mtx_lock(&Giant); + else kern_reboot(uap->opt); - mtx_unlock(&Giant); - } } return (error); } |