diff options
author | Matt Jacob <mjacob@FreeBSD.org> | 2005-01-22 07:21:25 +0000 |
---|---|---|
committer | Matt Jacob <mjacob@FreeBSD.org> | 2005-01-22 07:21:25 +0000 |
commit | c81d2c74ac4bf72e7c3668e760c64316a0a2c9a1 (patch) | |
tree | a49fe1b52db0d1b42244e6641d2f4ee228a9f0f2 /sys | |
parent | 00646ca2047305fce32d99edc7a8e6dfd801f3b4 (diff) | |
download | src-c81d2c74ac4bf72e7c3668e760c64316a0a2c9a1.tar.gz src-c81d2c74ac4bf72e7c3668e760c64316a0a2c9a1.zip |
Don't pass unadulterated unit numbers to make_dev and its ilk- if you
have more than 256 units, you die. Horribly. Convert them using
unit2minor.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=140608
Diffstat (limited to 'sys')
-rw-r--r-- | sys/cam/scsi/scsi_pass.c | 9 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_ses.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index a25a9d8a404b..774daee5b326 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -285,7 +285,8 @@ passregister(struct cam_periph *periph, void *arg) * it even has a blocksize. */ no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; - softc->device_stats = devstat_new_entry("pass", periph->unit_number, 0, + softc->device_stats = devstat_new_entry("pass", + unit2minor(periph->unit_number), 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -294,9 +295,9 @@ passregister(struct cam_periph *periph, void *arg) DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&pass_cdevsw, periph->unit_number, UID_ROOT, - GID_OPERATOR, 0600, "%s%d", periph->periph_name, - periph->unit_number); + softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), + UID_ROOT, GID_OPERATOR, 0600, "%s%d", + periph->periph_name, periph->unit_number); softc->dev->si_drv1 = periph; /* diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c index 0c8c2a924c98..a25fd9014c71 100644 --- a/sys/cam/scsi/scsi_ses.c +++ b/sys/cam/scsi/scsi_ses.c @@ -363,7 +363,7 @@ sesregister(struct cam_periph *periph, void *arg) return (CAM_REQ_CMP_ERR); } - softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number, + softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); softc->ses_dev->si_drv1 = periph; |