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>

2 files changed, 8 insertions, 6 deletions

diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 073a2c32ccc4..38a4504ce450 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -1498,7 +1498,7 @@ static int dpcm_transport(struct scsi_cmnd *srb, struct us_data *us)
 {
         int ret;
 
-        usb_stor_dbg(us, "LUN=%d\n", srb->device->lun);
+        usb_stor_dbg(us, "LUN=%d\n", (u8)srb->device->lun);
 
         switch (srb->device->lun) {
         case 0:
@@ -1524,7 +1524,7 @@ static int dpcm_transport(struct scsi_cmnd *srb, struct us_data *us)
                 break;
 
         default:
-                usb_stor_dbg(us, "Invalid LUN %d\n", srb->device->lun);
+            usb_stor_dbg(us, "Invalid LUN %d\n", (u8)srb->device->lun);
                 ret = USB_STOR_TRANSPORT_ERROR;
                 break;
         }
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index f1c96261a501..cedb29252a92 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -347,14 +347,16 @@ static int usb_stor_control_thread(void * __us)
                  */
                 else if (us->srb->device->id &&
                                 !(us->fflags & US_FL_SCM_MULT_TARG)) {
-                        usb_stor_dbg(us, "Bad target number (%d:%d)\n",
-                                     us->srb->device->id, us->srb->device->lun);
+                        usb_stor_dbg(us, "Bad target number (%d:%llu)\n",
+                                     us->srb->device->id,
+                                     us->srb->device->lun);
                         us->srb->result = DID_BAD_TARGET << 16;
                 }
 
                 else if (us->srb->device->lun > us->max_lun) {
-                        usb_stor_dbg(us, "Bad LUN (%d:%d)\n",
-                                     us->srb->device->id, us->srb->device->lun);
+                        usb_stor_dbg(us, "Bad LUN (%d:%llu)\n",
+                                     us->srb->device->id,
+                                     us->srb->device->lun);
                         us->srb->result = DID_BAD_TARGET << 16;
                 }