diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 2007-02-21 07:45:02 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 2007-02-21 07:45:02 +0000 |
| commit | 55fe33a3507c5ee29e723d184e51285d11c60335 (patch) | |
| tree | 86b52271583c718396e791a1a048208cfdacc7da | |
| parent | 5f9e5adf8b639e31a25922284df9544673521a86 (diff) | |
Notes
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 8 | ||||
| -rw-r--r-- | sys/geom/geom_disk.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 4d2100de4e08..b4863f69e438 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -1820,11 +1820,15 @@ dagetcapacity(struct cam_periph *periph) uint32_t block_len; uint64_t maxsector; int error; + u_int32_t sense_flags; softc = (struct da_softc *)periph->softc; block_len = 0; maxsector = 0; error = 0; + sense_flags = SF_RETRY_UA; + if (softc->flags & DA_FLAG_PACK_REMOVABLE) + sense_flags |= SF_NO_PRINT; /* Do a read capacity */ rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcaplong), @@ -1843,7 +1847,7 @@ dagetcapacity(struct cam_periph *periph) error = cam_periph_runccb(ccb, daerror, /*cam_flags*/CAM_RETRY_SELTO, - /*sense_flags*/SF_RETRY_UA, + sense_flags, softc->disk->d_devstat); if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) @@ -1878,7 +1882,7 @@ dagetcapacity(struct cam_periph *periph) error = cam_periph_runccb(ccb, daerror, /*cam_flags*/CAM_RETRY_SELTO, - /*sense_flags*/SF_RETRY_UA, + sense_flags, softc->disk->d_devstat); if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index 1a65d89d1659..390cd8ff37ec 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -133,7 +133,7 @@ g_disk_access(struct g_provider *pp, int r, int w, int e) if (dp->d_open != NULL) { g_disk_lock_giant(dp); error = dp->d_open(dp); - if (error != 0) + if (bootverbose && error != 0) printf("Opened disk %s -> %d\n", pp->name, error); g_disk_unlock_giant(dp); |