svn commit: r249349 - head/sys/dev/ciss

[Sean Bruno]

Author: sbruno
Date: Wed Apr 10 23:31:19 2013
New Revision: 249349
URL: http://svnweb.freebsd.org/changeset/base/249349

Log:
  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

Modified:
  head/sys/dev/ciss/ciss.c

Modified: head/sys/dev/ciss/ciss.c
==============================================================================
--- head/sys/dev/ciss/ciss.c	Wed Apr 10 23:20:09 2013	(r249348)
+++ head/sys/dev/ciss/ciss.c	Wed Apr 10 23:31:19 2013	(r249349)
@@ -3346,9 +3346,14 @@ ciss_cam_complete_fixup(struct ciss_soft
 
 	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);
     }
 }