diff options
| author | sbruno <sbruno@FreeBSD.org> | 2013-04-10 23:31:19 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2013-04-10 23:31:19 +0000 |
| commit | 981c7853881b18d3cbd361e519f79ecbf31384d5 (patch) | |
| tree | a04ab4cd4e002af859e58071c36addf61953dffb /sys/dev/ciss/ciss.c | |
| parent | 182d1a1c6784541d3388a56f135066bc4dfaead1 (diff) | |
| download | FreeBSD-src-981c7853881b18d3cbd361e519f79ecbf31384d5.zip FreeBSD-src-981c7853881b18d3cbd361e519f79ecbf31384d5.tar.gz | |
While investigating a p/r I noted that the camcontrol devlist output for
volumes behind a ciss(4) controller were being reported with malformeed
names and identifiers.
Repair that reporting by using the CAM values for the three SCSI indents
reported via camcontrol devlist
PR: kern/171650
Reviewed by: scottl
Obtained from: Yahoo! Inc.
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/ciss/ciss.c')
| -rw-r--r-- | sys/dev/ciss/ciss.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index c023f39..3683931 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -3346,9 +3346,14 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio) cl = &sc->ciss_logical[bus][target]; - padstr(inq->vendor, "COMPAQ", 8); - padstr(inq->product, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8); - padstr(inq->revision, ciss_name_ldrive_status(cl->cl_lstatus->status), 16); + padstr(inq->vendor, "COMPAQ", + SID_VENDOR_SIZE); + padstr(inq->product, + ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), + SID_PRODUCT_SIZE); + padstr(inq->revision, + ciss_name_ldrive_status(cl->cl_lstatus->status), + SID_REVISION_SIZE); } } |
