summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2016-01-12 14:18:54 +0000
committertrasz <trasz@FreeBSD.org>2016-01-12 14:18:54 +0000
commit6d8bdedefa5f14938f41ed43ceee493156a35c0f (patch)
tree5be6cdca66d230780b948a0272102da00354b491
parent8bd7436f2ba8cb82b96bb85dc75e58ed686efebb (diff)
downloadFreeBSD-src-6d8bdedefa5f14938f41ed43ceee493156a35c0f.zip
FreeBSD-src-6d8bdedefa5f14938f41ed43ceee493156a35c0f.tar.gz
Hide the "unmount of /dev failed (BUSY)" warning at shutdown or reboot,
introduced with r293742, just like it was hidden before that commit. This is a direct commit to 10-STABLE; this special case is not needed in 11-CURRENT, because devfs supports forced unmounts there. The forced unmount could be MFC-ed, but there are some LORs at shutdown, and I have a weird feelings about it. Sponsored by: The FreeBSD Foundation
-rw-r--r--sys/kern/vfs_subr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index cd5d6f0..a721c5a 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -3734,7 +3734,7 @@ unmount_or_warn(struct mount *mp)
int error;
error = dounmount(mp, MNT_FORCE, curthread);
- if (error != 0) {
+ if (error != 0 && strcmp(mp->mnt_vfc->vfc_name, "devfs") != 0) {
printf("unmount of %s failed (", mp->mnt_stat.f_mntonname);
if (error == EBUSY)
printf("BUSY)\n");
OpenPOWER on IntegriCloud