1 files changed, 54 insertions, 15 deletions

diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index f16e3caed58a..e183a3ef7839 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -93,6 +93,7 @@ struct cciss_scsi_cmd_stack_elem_t {
         CommandList_struct cmd;
         ErrorInfo_struct Err;
         __u32 busaddr;
+        __u32 pad;
 };
 
 #pragma pack()
@@ -877,7 +878,7 @@ cciss_scsi_interpret_error(CommandList_struct *cp)
 
 static int
 cciss_scsi_do_inquiry(ctlr_info_t *c, unsigned char *scsi3addr, 
-                 InquiryData_struct *buf)
+                 unsigned char *buf, unsigned char bufsize)
 {
         int rc;
         CommandList_struct *cp;
@@ -900,11 +901,10 @@ cciss_scsi_do_inquiry(ctlr_info_t *c, unsigned char *scsi3addr,
         cdb[1] = 0;
         cdb[2] = 0;
         cdb[3] = 0;
-        cdb[4] = sizeof(*buf) & 0xff;
+        cdb[4] = bufsize;
         cdb[5] = 0;
         rc = cciss_scsi_do_simple_cmd(c, cp, scsi3addr, cdb, 
-                                6, (unsigned char *) buf, 
-                                sizeof(*buf), XFER_READ);
+                                6, buf, bufsize, XFER_READ);
 
         if (rc != 0) return rc; /* something went wrong */
 
@@ -1000,9 +1000,10 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)
            that though.  
 
          */
-
+#define OBDR_TAPE_INQ_SIZE 49
+#define OBDR_TAPE_SIG "$DR-10"
         ReportLunData_struct *ld_buff;
-        InquiryData_struct *inq_buff;
+        unsigned char *inq_buff;
         unsigned char scsi3addr[8];
         ctlr_info_t *c;
         __u32 num_luns=0;
@@ -1020,7 +1021,7 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)
                 return;
         }
         memset(ld_buff, 0, reportlunsize);
-        inq_buff = kmalloc(sizeof( InquiryData_struct), GFP_KERNEL);
+        inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);
         if (inq_buff == NULL) {
                 printk(KERN_ERR "cciss: out of memory\n");
                 kfree(ld_buff);
@@ -1051,19 +1052,36 @@ cciss_update_non_disk_devices(int cntl_num, int hostno)
 
                 /* for each physical lun, do an inquiry */
                 if (ld_buff->LUN[i][3] & 0xC0) continue;
-                memset(inq_buff, 0, sizeof(InquiryData_struct));
+                memset(inq_buff, 0, OBDR_TAPE_INQ_SIZE);
                 memcpy(&scsi3addr[0], &ld_buff->LUN[i][0], 8);
 
-                if (cciss_scsi_do_inquiry(hba[cntl_num], 
-                        scsi3addr, inq_buff) != 0)
-                {
+                if (cciss_scsi_do_inquiry(hba[cntl_num], scsi3addr, inq_buff,
+                        (unsigned char) OBDR_TAPE_INQ_SIZE) != 0) {
                         /* Inquiry failed (msg printed already) */
                         devtype = 0; /* so we will skip this device. */
                 } else /* what kind of device is this? */
-                        devtype = (inq_buff->data_byte[0] & 0x1f);
+                        devtype = (inq_buff[0] & 0x1f);
 
                 switch (devtype)
                 {
+                  case 0x05: /* CD-ROM */ {
+
+                        /* We don't *really* support actual CD-ROM devices,
+                         * just this "One Button Disaster Recovery" tape drive
+                         * which temporarily pretends to be a CD-ROM drive.
+                         * So we check that the device is really an OBDR tape
+                         * device by checking for "$DR-10" in bytes 43-48 of
+                         * the inquiry data.
+                         */
+                                char obdr_sig[7];
+
+                                strncpy(obdr_sig, &inq_buff[43], 6);
+                                obdr_sig[6] = '\0';
+                                if (strncmp(obdr_sig, OBDR_TAPE_SIG, 6) != 0)
+                                        /* Not OBDR device, ignore it. */
+                                        break;
+                        }
+                        /* fall through . . . */
                   case 0x01: /* sequential access, (tape) */
                   case 0x08: /* medium changer */
                         if (ncurrent >= CCISS_MAX_SCSI_DEVS_PER_HBA) {
@@ -1126,6 +1144,7 @@ cciss_scsi_proc_info(struct Scsi_Host *sh,
 
         int buflen, datalen;
         ctlr_info_t *ci;
+        int i;
         int cntl_num;
 
 
@@ -1136,8 +1155,28 @@ cciss_scsi_proc_info(struct Scsi_Host *sh,
         cntl_num = ci->ctlr;    /* Get our index into the hba[] array */
 
         if (func == 0) {        /* User is reading from /proc/scsi/ciss*?/?*  */
-                buflen = sprintf(buffer, "hostnum=%d\n", sh->host_no);  
-
+                buflen = sprintf(buffer, "cciss%d: SCSI host: %d\n",
+                                cntl_num, sh->host_no);
+
+                /* this information is needed by apps to know which cciss
+                   device corresponds to which scsi host number without
+                   having to open a scsi target device node.  The device
+                   information is not a duplicate of /proc/scsi/scsi because
+                   the two may be out of sync due to scsi hotplug, rather
+                   this info is for an app to be able to use to know how to
+                   get them back in sync. */
+
+                for (i=0;i<ccissscsi[cntl_num].ndevices;i++) {
+                        struct cciss_scsi_dev_t *sd = &ccissscsi[cntl_num].dev[i];
+                        buflen += sprintf(&buffer[buflen], "c%db%dt%dl%d %02d "
+                                "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                                sh->host_no, sd->bus, sd->target, sd->lun,
+                                sd->devtype,
+                                sd->scsi3addr[0], sd->scsi3addr[1],
+                                sd->scsi3addr[2], sd->scsi3addr[3],
+                                sd->scsi3addr[4], sd->scsi3addr[5],
+                                sd->scsi3addr[6], sd->scsi3addr[7]);
+                }
                 datalen = buflen - offset;
                 if (datalen < 0) {      /* they're reading past EOF. */
                         datalen = 0;
@@ -1399,7 +1438,7 @@ cciss_proc_tape_report(int ctlr, unsigned char *buffer, off_t *pos, off_t *len)
 
         CPQ_TAPE_LOCK(ctlr, flags);
         size = sprintf(buffer + *len, 
-                "       Sequential access devices: %d\n\n",
+                "Sequential access devices: %d\n\n",
                         ccissscsi[ctlr].ndevices);
         CPQ_TAPE_UNLOCK(ctlr, flags);
         *pos += size; *len += size;