summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-09-05 21:15:58 +0000
committerphk <phk@FreeBSD.org>2004-09-05 21:15:58 +0000
commit38ae102f61e34fccf24c864f91b3f2560e50b18b (patch)
tree147fda4145293281b55787fc3a7e6af561de17f6 /sys/cam
parent2087edb93832a47d6a043b58602f699b1b2967a4 (diff)
downloadFreeBSD-src-38ae102f61e34fccf24c864f91b3f2560e50b18b.zip
FreeBSD-src-38ae102f61e34fccf24c864f91b3f2560e50b18b.tar.gz
For removable devices without media we set a zero mediasize but a non-zero
sectorsize in order to avoid a lot of checks around various divisions etc. Enforce the sectorsize being > 0 with a KASSERT on successful open. Fix scsi_cd.c to return 2k sectors when no media inserted.
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/scsi/scsi_cd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index ac65e36..f587b00 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -2723,7 +2723,7 @@ cdcheckmedia(struct cam_periph *periph)
cdprevent(periph, PR_PREVENT);
softc->disk->d_maxsize = DFLTPHYS;
- softc->disk->d_sectorsize = 0;
+ softc->disk->d_sectorsize = 2048;
softc->disk->d_mediasize = 0;
/*
OpenPOWER on IntegriCloud