[PATCH 1/1] aacraid: informational sysfs value corrections

[Salyzyn, Mark]

Some sysfs problems reported. The serial number on late model controllers was 
truncated. Non-DASD devices (tapes and CDROMs) were showing up as JBOD in the 
level report on the physical channel.

This attached patch is against current scsi-misc-2.6.

ObligatoryDisclaimer: Please accept my condolences regarding Outlook's handling 
of patch attachments (inline gets damaged, please use attachment).

Signed-off-by: Mark Salyzyn <[EMAIL PROTECTED]>

 drivers/scsi/aacraid/linit.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff -ru a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/aacraid/linit.c      2008-02-08 11:22:43.497295473 -0500
+++ b/drivers/scsi/aacraid/linit.c      2008-02-08 11:51:52.376880890 -0500
@@ -494,13 +494,14 @@

 static ssize_t aac_show_raid_level(struct device *dev, struct device_attribute
*attr, char *buf)
 {
-       struct scsi_device * sdev = to_scsi_device(dev);
+       struct scsi_device *sdev = to_scsi_device(dev);
+       struct aac_dev *aac = (struct aac_dev *)(sdev->host->hostdata);
        if (sdev_channel(sdev) != CONTAINER_CHANNEL)
                return snprintf(buf, PAGE_SIZE, sdev->no_uld_attach
-                 ? "Hidden\n" : "JBOD");
+                 ? "Hidden\n" :
+                 ((aac->jbod && (sdev->type == TYPE_DISK)) ? "JBOD\n" : ""));
        return snprintf(buf, PAGE_SIZE, "%s\n",
-         get_container_type(((struct aac_dev *)(sdev->host->hostdata))
-           ->fsa_dev[sdev_id(sdev)].type));
+         get_container_type(aac->fsa_dev[sdev_id(sdev)].type));
 }

 static struct device_attribute aac_raid_level_attr = {
@@ -860,8 +861,8 @@
                  le32_to_cpu(dev->adapter_info.serial[0]));
        if (len &&
          !memcmp(&dev->supplement_adapter_info.MfgPcbaSerialNo[
-           sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)+2-len],
-         buf, len))
+           sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)-len],
+         buf, len-1))
                len = snprintf(buf, PAGE_SIZE, "%.*s\n",
                  (int)sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo),
                  dev->supplement_adapter_info.MfgPcbaSerialNo);

Sincerely - Mark Salyzyn

aacraid_serial_level_sysfs.patch
Description: aacraid_serial_level_sysfs.patch