diff options
| author | Renato Botelho <renato@netgate.com> | 2016-07-19 11:28:18 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-07-19 11:28:18 -0300 |
| commit | a3c20a378f7a9fa76e9301a43ac64ed07057d01e (patch) | |
| tree | d14045c61b471f327f487431e05b0c4fe0cd8d76 /sys/kern | |
| parent | 3a4027cfafa37c1a0c0b05987c0edb1452c7bd2b (diff) | |
| parent | 3f1f4f0e73b6d12c01e8cad4791d23e8e56127db (diff) | |
| download | FreeBSD-src-a3c20a378f7a9fa76e9301a43ac64ed07057d01e.zip FreeBSD-src-a3c20a378f7a9fa76e9301a43ac64ed07057d01e.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_mutex.c | 9 | ||||
| -rw-r--r-- | sys/kern/vfs_mount.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index fb0b313..908f99a 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -658,8 +658,15 @@ thread_lock_flags_(struct thread *td, int opts, const char *file, int line) i = 0; tid = (uintptr_t)curthread; - if (SCHEDULER_STOPPED()) + if (SCHEDULER_STOPPED()) { + /* + * Ensure that spinlock sections are balanced even when the + * scheduler is stopped, since we may otherwise inadvertently + * re-enable interrupts while dumping core. + */ + spinlock_enter(); return; + } #ifdef KDTRACE_HOOKS spin_time -= lockstat_nsecs(&td->td_lock->lock_object); diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index f5f522e..496b852 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1315,7 +1315,8 @@ dounmount(struct mount *mp, int flags, struct thread *td) */ if ((flags & MNT_FORCE) && VFS_ROOT(mp, LK_EXCLUSIVE, &fsrootvp) == 0) { - if (mp->mnt_vnodecovered != NULL) + if (mp->mnt_vnodecovered != NULL && + (mp->mnt_flag & MNT_IGNORE) == 0) mountcheckdirs(fsrootvp, mp->mnt_vnodecovered); if (fsrootvp == rootvnode) { vrele(rootvnode); @@ -1336,7 +1337,8 @@ dounmount(struct mount *mp, int flags, struct thread *td) if (error && error != ENXIO) { if ((flags & MNT_FORCE) && VFS_ROOT(mp, LK_EXCLUSIVE, &fsrootvp) == 0) { - if (mp->mnt_vnodecovered != NULL) + if (mp->mnt_vnodecovered != NULL && + (mp->mnt_flag & MNT_IGNORE) == 0) mountcheckdirs(mp->mnt_vnodecovered, fsrootvp); if (rootvnode == NULL) { rootvnode = fsrootvp; |
