Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[zynq/linux.git] / drivers / scsi / smartpqi / smartpqi_init.c

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index f564af8949e8694673043e506b3b5a9fbdcf7c3c..75ec43aa8df381c0f82a75ecd393fc19c4251c14 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -2764,6 +2764,12 @@ static void pqi_process_raid_io_error(struct pqi_io_request *io_request)
                                sshdr.sense_key == HARDWARE_ERROR &&
                                sshdr.asc == 0x3e &&
                                sshdr.ascq == 0x1) {
+                       struct pqi_ctrl_info *ctrl_info = shost_to_hba(scmd->device->host);
+                       struct pqi_scsi_dev *device = scmd->device->hostdata;
+
+                       if (printk_ratelimit())
+                               scmd_printk(KERN_ERR, scmd, "received 'logical unit failure' from controller for scsi %d:%d:%d:%d\n",
+                                       ctrl_info->scsi_host->host_no, device->bus, device->target, device->lun);
                        pqi_take_device_offline(scmd->device, "RAID");
                        host_byte = DID_NO_CONNECT;
                }
@@ -6043,7 +6049,8 @@ out:
        return rc;
 }
 
-static int pqi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
+static int pqi_ioctl(struct scsi_device *sdev, unsigned int cmd,
+                    void __user *arg)
 {
        int rc;
        struct pqi_ctrl_info *ctrl_info;