diff options
| author | marius <marius@FreeBSD.org> | 2014-06-23 08:32:36 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2014-06-23 08:32:36 +0000 |
| commit | 27080bb5dd76a1cdeb22a38fa394a17d52a3ee06 (patch) | |
| tree | 8a5a4a2198ab38f54e732fcb16cd67660ee71d2e | |
| parent | e7db5d1d1043b1e42ee1d16d4d29cefe04b874d3 (diff) | |
| download | FreeBSD-src-27080bb5dd76a1cdeb22a38fa394a17d52a3ee06.zip FreeBSD-src-27080bb5dd76a1cdeb22a38fa394a17d52a3ee06.tar.gz | |
MFC: r267638
Don't denounce peripherals on system shutdown. Together with r267321
(MFCed to stable/10 in r267775), we're now back to the pre-r228483
level of default verbosity. This in turn again typically allows for
reading information that userland might have printed on the screen
before initiating a halt, but still permits to debug potential device
shutdown problems on system shutdown via CAM_DEBUG etc.
Reviewed by: mav
Sponsored by: Bally Wulff Games & Entertainment GmbH
| -rw-r--r-- | sys/cam/cam_periph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 1628ab0..2e23996 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -597,7 +597,7 @@ cam_periph_invalidate(struct cam_periph *periph) return; CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n")); - if (periph->flags & CAM_PERIPH_ANNOUNCED) + if ((periph->flags & CAM_PERIPH_ANNOUNCED) && !rebooting) xpt_denounce_periph(periph); periph->flags |= CAM_PERIPH_INVALID; periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND; @@ -663,9 +663,9 @@ camperiphfree(struct cam_periph *periph) xpt_remove_periph(periph); xpt_unlock_buses(); - if (periph->flags & CAM_PERIPH_ANNOUNCED) { + if ((periph->flags & CAM_PERIPH_ANNOUNCED) && !rebooting) xpt_print(periph->path, "Periph destroyed\n"); - } else + else CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n")); if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) { |
