scsi: use 64-bit LUNs

The SCSI standard defines 64-bit values for LUNs, and large arrays
employing large or hierarchical LUN numbers become more and more
common.

So update the linux SCSI stack to use 64-bit LUN numbers.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Ewan Milne <emilne@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index c0ae8fa57a3b..67283ef418ac 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -459,7 +459,7 @@ static int adpt_queue_lck(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd
                  * to the device structure.  This should be a TEST_UNIT_READY
                  * command from scan_scsis_single.
                  */
-                if ((pDev = adpt_find_device(pHba, (u32)cmd->device->channel, (u32)cmd->device->id, (u32)cmd->device->lun)) == NULL) {
+                if ((pDev = adpt_find_device(pHba, (u32)cmd->device->channel, (u32)cmd->device->id, cmd->device->lun)) == NULL) {
                         // TODO: if any luns are at this bus, scsi id then fake a TEST_UNIT_READY and INQUIRY response 
                         // with type 7F (for all luns less than the max for this bus,id) so the lun scan will continue.
                         cmd->result = (DID_NO_CONNECT << 16);
@@ -579,8 +579,8 @@ static int adpt_show_info(struct seq_file *m, struct Scsi_Host *host)
                                 seq_printf(m," Rev: %-8.8s\n", d->pScsi_dev->rev);
 
                                 unit = d->pI2o_dev->lct_data.tid;
-                                seq_printf(m, "\tTID=%d, (Channel=%d, Target=%d, Lun=%d)  (%s)\n\n",
-                                               unit, (int)d->scsi_channel, (int)d->scsi_id, (int)d->scsi_lun,
+                                seq_printf(m, "\tTID=%d, (Channel=%d, Target=%d, Lun=%llu)  (%s)\n\n",
+                                               unit, (int)d->scsi_channel, (int)d->scsi_id, d->scsi_lun,
                                                scsi_device_online(d->pScsi_dev)? "online":"offline"); 
                                 d = d->next_lun;
                         }
@@ -1162,7 +1162,7 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
         }
 }
 
-static struct adpt_device* adpt_find_device(adpt_hba* pHba, u32 chan, u32 id, u32 lun)
+static struct adpt_device* adpt_find_device(adpt_hba* pHba, u32 chan, u32 id, u64 lun)
 {
         struct adpt_device* d;
 
@@ -1462,7 +1462,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
         i2o_lct *lct = pHba->lct;
         u8 bus_no = 0;
         s16 scsi_id;
-        s16 scsi_lun;
+        u64 scsi_lun;
         u32 buf[10]; // larger than 7, or 8 ...
         struct adpt_device* pDev; 
         
@@ -1496,7 +1496,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
                         }
                         bus_no = buf[0]>>16;
                         scsi_id = buf[1];
-                        scsi_lun = (buf[2]>>8 )&0xff;
+                        scsi_lun = scsilun_to_int((struct scsi_lun *)&buf[2]);
                         if(bus_no >= MAX_CHANNEL) {     // Something wrong skip it
                                 printk(KERN_WARNING"%s: Channel number %d out of range \n", pHba->name, bus_no);
                                 continue;
@@ -1571,7 +1571,7 @@ static int adpt_i2o_parse_lct(adpt_hba* pHba)
                         if(adpt_i2o_query_scalar(pHba, tid, 0x8000, -1, buf, 32)>=0) {
                                 bus_no = buf[0]>>16;
                                 scsi_id = buf[1];
-                                scsi_lun = (buf[2]>>8 )&0xff;
+                                scsi_lun = scsilun_to_int((struct scsi_lun *)&buf[2]);
                                 if(bus_no >= MAX_CHANNEL) {     // Something wrong skip it
                                         continue;
                                 }
@@ -2407,8 +2407,8 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
                 case I2O_SCSI_DSC_COMMAND_TIMEOUT:
                 case I2O_SCSI_DSC_NO_ADAPTER:
                 case I2O_SCSI_DSC_RESOURCE_UNAVAILABLE:
-                        printk(KERN_WARNING"%s: SCSI Timeout-Device (%d,%d,%d) hba status=0x%x, dev status=0x%x, cmd=0x%x\n",
-                                pHba->name, (u32)cmd->device->channel, (u32)cmd->device->id, (u32)cmd->device->lun, hba_status, dev_status, cmd->cmnd[0]);
+                        printk(KERN_WARNING"%s: SCSI Timeout-Device (%d,%d,%llu) hba status=0x%x, dev status=0x%x, cmd=0x%x\n",
+                                pHba->name, (u32)cmd->device->channel, (u32)cmd->device->id, cmd->device->lun, hba_status, dev_status, cmd->cmnd[0]);
                         cmd->result = (DID_TIME_OUT << 16);
                         break;
                 case I2O_SCSI_DSC_ADAPTER_BUSY:
@@ -2447,8 +2447,8 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
                 case I2O_SCSI_DSC_QUEUE_FROZEN:
                 case I2O_SCSI_DSC_REQUEST_INVALID:
                 default:
-                        printk(KERN_WARNING"%s: SCSI error %0x-Device(%d,%d,%d) hba_status=0x%x, dev_status=0x%x, cmd=0x%x\n",
-                                pHba->name, detailed_status & I2O_SCSI_DSC_MASK, (u32)cmd->device->channel, (u32)cmd->device->id, (u32)cmd->device->lun,
+                        printk(KERN_WARNING"%s: SCSI error %0x-Device(%d,%d,%llu) hba_status=0x%x, dev_status=0x%x, cmd=0x%x\n",
+                                pHba->name, detailed_status & I2O_SCSI_DSC_MASK, (u32)cmd->device->channel, (u32)cmd->device->id, cmd->device->lun,
                                hba_status, dev_status, cmd->cmnd[0]);
                         cmd->result = (DID_ERROR << 16);
                         break;
@@ -2464,8 +2464,8 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
                            cmd->sense_buffer[2] == DATA_PROTECT ){
                                 /* This is to handle an array failed */
                                 cmd->result = (DID_TIME_OUT << 16);
-                                printk(KERN_WARNING"%s: SCSI Data Protect-Device (%d,%d,%d) hba_status=0x%x, dev_status=0x%x, cmd=0x%x\n",
-                                        pHba->name, (u32)cmd->device->channel, (u32)cmd->device->id, (u32)cmd->device->lun, 
+                                printk(KERN_WARNING"%s: SCSI Data Protect-Device (%d,%d,%llu) hba_status=0x%x, dev_status=0x%x, cmd=0x%x\n",
+                                        pHba->name, (u32)cmd->device->channel, (u32)cmd->device->id, cmd->device->lun,
                                         hba_status, dev_status, cmd->cmnd[0]);
 
                         }
@@ -2476,8 +2476,8 @@ static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
                  * for a limitted number of retries.
                  */
                 cmd->result = (DID_TIME_OUT << 16);
-                printk(KERN_WARNING"%s: I2O MSG_FAIL - Device (%d,%d,%d) tid=%d, cmd=0x%x\n",
-                        pHba->name, (u32)cmd->device->channel, (u32)cmd->device->id, (u32)cmd->device->lun,
+                printk(KERN_WARNING"%s: I2O MSG_FAIL - Device (%d,%d,%llu) tid=%d, cmd=0x%x\n",
+                        pHba->name, (u32)cmd->device->channel, (u32)cmd->device->id, cmd->device->lun,
                         ((struct adpt_device*)(cmd->device->hostdata))->tid, cmd->cmnd[0]);
         }
 
@@ -2517,7 +2517,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
         i2o_lct *lct = pHba->lct;
         u8 bus_no = 0;
         s16 scsi_id;
-        s16 scsi_lun;
+        u64 scsi_lun;
         u32 buf[10]; // at least 8 u32's
         struct adpt_device* pDev = NULL;
         struct i2o_device* pI2o_dev = NULL;
@@ -2564,7 +2564,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                         }
 
                         scsi_id = buf[1];
-                        scsi_lun = (buf[2]>>8 )&0xff;
+                        scsi_lun = scsilun_to_int((struct scsi_lun *)&buf[2]);
                         pDev = pHba->channel[bus_no].device[scsi_id];
                         /* da lun */
                         while(pDev) {
@@ -2633,7 +2633,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                         while(pDev) {
                                 if(pDev->scsi_lun == scsi_lun) {
                                         if(!scsi_device_online(pDev->pScsi_dev)) {
-                                                printk(KERN_WARNING"%s: Setting device (%d,%d,%d) back online\n",
+                                                printk(KERN_WARNING"%s: Setting device (%d,%d,%llu) back online\n",
                                                                 pHba->name,bus_no,scsi_id,scsi_lun);
                                                 if (pDev->pScsi_dev) {
                                                         scsi_device_set_state(pDev->pScsi_dev, SDEV_RUNNING);
@@ -2665,7 +2665,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba* pHba)
                 // in the LCT table
                 if (pDev->state & DPTI_DEV_UNSCANNED){
                         pDev->state = DPTI_DEV_OFFLINE;
-                        printk(KERN_WARNING"%s: Device (%d,%d,%d) offline\n",pHba->name,pDev->scsi_channel,pDev->scsi_id,pDev->scsi_lun);
+                        printk(KERN_WARNING"%s: Device (%d,%d,%llu) offline\n",pHba->name,pDev->scsi_channel,pDev->scsi_id,pDev->scsi_lun);
                         if (pDev->pScsi_dev) {
                                 scsi_device_set_state(pDev->pScsi_dev, SDEV_OFFLINE);
                         }