scsi: use 64-bit LUNs

[deliverable/linux.git] / drivers / message / fusion / mptscsih.c

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 727819cc703422578c1f0f71c77efff1333f1c6c..39e566803089bb2b685dc6eb4ea918e0c620ed26 100644 (file)
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -95,7 +95,7 @@ static void   mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx);
 static void    mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply);
 
 int    mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id,
-               int lun, int ctx2abort, ulong timeout);
+               u64 lun, int ctx2abort, ulong timeout);
 
 int            mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
 int            mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
@@ -536,7 +536,7 @@ mptscsih_info_scsiio(MPT_ADAPTER *ioc, struct scsi_cmnd *sc, SCSIIOReply_t * pSc
        }
 
        scsi_print_command(sc);
-       printk(MYIOC_s_DEBUG_FMT "\tfw_channel = %d, fw_id = %d, lun = %d\n",
+       printk(MYIOC_s_DEBUG_FMT "\tfw_channel = %d, fw_id = %d, lun = %llu\n",
            ioc->name, pScsiReply->Bus, pScsiReply->TargetID, sc->device->lun);
        printk(MYIOC_s_DEBUG_FMT "\trequest_len = %d, underflow = %d, "
            "resid = %d\n", ioc->name, scsi_bufflen(sc), sc->underflow,
@@ -692,7 +692,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                 */
                if (scsi_state & MPI_SCSI_STATE_RESPONSE_INFO_VALID &&
                    pScsiReply->ResponseInfo) {
-                       printk(MYIOC_s_NOTE_FMT "[%d:%d:%d:%d] "
+                       printk(MYIOC_s_NOTE_FMT "[%d:%d:%d:%llu] "
                        "FCP_ResponseInfo=%08xh\n", ioc->name,
                        sc->device->host->host_no, sc->device->channel,
                        sc->device->id, sc->device->lun,
@@ -1155,7 +1155,7 @@ mptscsih_report_queue_full(struct scsi_cmnd *sc, SCSIIOReply_t *pScsiReply, SCSI
                return;
        ioc = hd->ioc;
        if (time - hd->last_queue_full > 10 * HZ) {
-               dprintk(ioc, printk(MYIOC_s_WARN_FMT "Device (%d:%d:%d) reported QUEUE_FULL!\n",
+               dprintk(ioc, printk(MYIOC_s_WARN_FMT "Device (%d:%d:%llu) reported QUEUE_FULL!\n",
                                ioc->name, 0, sc->device->id, sc->device->lun));
                hd->last_queue_full = time;
        }
@@ -1304,7 +1304,6 @@ int mptscsih_show_info(struct seq_file *m, struct Scsi_Host *host)
 /**
  *     mptscsih_qcmd - Primary Fusion MPT SCSI initiator IO start routine.
  *     @SCpnt: Pointer to scsi_cmnd structure
- *     @done: Pointer SCSI mid-layer IO completion function
  *
  *     (linux scsi_host_template.queuecommand routine)
  *     This is the primary SCSI IO start routine.  Create a MPI SCSIIORequest
@@ -1313,7 +1312,7 @@ int mptscsih_show_info(struct seq_file *m, struct Scsi_Host *host)
  *     Returns 0. (rtn value discarded by linux scsi mid-layer)
  */
 int
-mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+mptscsih_qcmd(struct scsi_cmnd *SCpnt)
 {
        MPT_SCSI_HOST           *hd;
        MPT_FRAME_HDR           *mf;
@@ -1329,10 +1328,9 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 
        hd = shost_priv(SCpnt->device->host);
        ioc = hd->ioc;
-       SCpnt->scsi_done = done;
 
-       dmfprintk(ioc, printk(MYIOC_s_DEBUG_FMT "qcmd: SCpnt=%p, done()=%p\n",
-               ioc->name, SCpnt, done));
+       dmfprintk(ioc, printk(MYIOC_s_DEBUG_FMT "qcmd: SCpnt=%p\n",
+               ioc->name, SCpnt));
 
        if (ioc->taskmgmt_quiesce_io)
                return SCSI_MLQUEUE_HOST_BUSY;
@@ -1520,7 +1518,7 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx)
  *
  **/
 int
-mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun,
+mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, u64 lun,
        int ctx2abort, ulong timeout)
 {
        MPT_FRAME_HDR   *mf;
@@ -2382,7 +2380,7 @@ mptscsih_slave_configure(struct scsi_device *sdev)
        vdevice = sdev->hostdata;
 
        dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-               "device @ %p, channel=%d, id=%d, lun=%d\n",
+               "device @ %p, channel=%d, id=%d, lun=%llu\n",
                ioc->name, sdev, sdev->channel, sdev->id, sdev->lun));
        if (ioc->bus_type == SPI)
                dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
@@ -2973,7 +2971,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
                                           + (my_idx * MPT_SENSE_BUFFER_ALLOC));
 
        devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-           "%s: Sending Command 0x%02x for fw_channel=%d fw_id=%d lun=%d\n",
+           "%s: Sending Command 0x%02x for fw_channel=%d fw_id=%d lun=%llu\n",
            ioc->name, __func__, cmd, io->channel, io->id, io->lun));
 
        if (dir == MPI_SCSIIO_CONTROL_READ)