3 files changed, 18 insertions, 10 deletions

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 2e797a367608..d89b9b4deb3c 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -760,7 +760,8 @@ intr_ret_t acornscsi_kick(AS_Host *host)
             SCpnt->tag = SCpnt->device->current_tag;
         } else
 #endif
-            set_bit(SCpnt->device->id * 8 + SCpnt->device->lun, host->busyluns);
+            set_bit(SCpnt->device->id * 8 +
+                    (u8)(SCpnt->device->lun & 0x07), host->busyluns);
 
         host->stats.removes += 1;
 
@@ -863,7 +864,8 @@ static void acornscsi_done(AS_Host *host, struct scsi_cmnd **SCpntp,
         if (!SCpnt->scsi_done)
             panic("scsi%d.H: null scsi_done function in acornscsi_done", host->host->host_no);
 
-        clear_bit(SCpnt->device->id * 8 + SCpnt->device->lun, host->busyluns);
+        clear_bit(SCpnt->device->id * 8 +
+                  (u8)(SCpnt->device->lun & 0x7), host->busyluns);
 
         SCpnt->scsi_done(SCpnt);
     } else
@@ -1576,7 +1578,8 @@ void acornscsi_message(AS_Host *host)
             printk(KERN_NOTICE "scsi%d.%c: disabling tagged queueing\n",
                     host->host->host_no, acornscsi_target(host));
             host->SCpnt->device->simple_tags = 0;
-            set_bit(host->SCpnt->device->id * 8 + host->SCpnt->device->lun, host->busyluns);
+            set_bit(host->SCpnt->device->id * 8 +
+                    (u8)(host->SCpnt->device->lun & 0x7), host->busyluns);
             break;
 #endif
         case EXTENDED_MESSAGE | (EXTENDED_SDTR << 8):
@@ -2671,7 +2674,8 @@ int acornscsi_abort(struct scsi_cmnd *SCpnt)
 //#if (DEBUG & DEBUG_ABORT)
                 printk("clear ");
 //#endif
-                clear_bit(SCpnt->device->id * 8 + SCpnt->device->lun, host->busyluns);
+                clear_bit(SCpnt->device->id * 8 +
+                          (u8)(SCpnt->device->lun & 0x7), host->busyluns);
 
         /*
          * We found the command, and cleared it out.  Either
@@ -2853,7 +2857,7 @@ static int acornscsi_show_info(struct seq_file *m, struct Scsi_Host *instance)
 
     shost_for_each_device(scd, instance) {
         seq_printf(m, "Device/Lun TaggedQ      Sync\n");
-        seq_printf(m, "     %d/%d   ", scd->id, scd->lun);
+        seq_printf(m, "     %d/%llu   ", scd->id, scd->lun);
         if (scd->tagged_supported)
                 seq_printf(m, "%3sabled(%3d) ",
                              scd->simple_tags ? "en" : "dis",
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index b46a6f6c0eb3..71cfb1e504c4 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -1821,7 +1821,8 @@ static void fas216_allocate_tag(FAS216_Info *info, struct scsi_cmnd *SCpnt)
                         SCpnt->tag = SCpnt->device->current_tag;
         } else
 #endif
-                set_bit(SCpnt->device->id * 8 + SCpnt->device->lun, info->busyluns);
+                set_bit(SCpnt->device->id * 8 +
+                        (u8)(SCpnt->device->lun & 0x7), info->busyluns);
 
         info->stats.removes += 1;
         switch (SCpnt->cmnd[0]) {
@@ -2171,7 +2172,8 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
          * status.
          */
         info->device[SCpnt->device->id].parity_check = 0;
-        clear_bit(SCpnt->device->id * 8 + SCpnt->device->lun, info->busyluns);
+        clear_bit(SCpnt->device->id * 8 +
+                  (u8)(SCpnt->device->lun & 0x7), info->busyluns);
 
         fn = (void (*)(FAS216_Info *, struct scsi_cmnd *, unsigned int))SCpnt->host_scribble;
         fn(info, SCpnt, result);
@@ -2398,7 +2400,8 @@ static enum res_find fas216_find_command(FAS216_Info *info,
                  * been set.
                  */
                 info->origSCpnt = NULL;
-                clear_bit(SCpnt->device->id * 8 + SCpnt->device->lun, info->busyluns);
+                clear_bit(SCpnt->device->id * 8 +
+                          (u8)(SCpnt->device->lun & 0x7), info->busyluns);
                 printk("waiting for execution ");
                 res = res_success;
         } else
@@ -3000,7 +3003,7 @@ void fas216_print_devices(FAS216_Info *info, struct seq_file *m)
 
         shost_for_each_device(scd, info->host) {
                 dev = &info->device[scd->id];
-                seq_printf(m, "     %d/%d   ", scd->id, scd->lun);
+                seq_printf(m, "     %d/%llu   ", scd->id, scd->lun);
                 if (scd->tagged_supported)
                         seq_printf(m, "%3sabled(%3d) ",
                                      scd->simple_tags ? "en" : "dis",
diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index cb11ccef54e5..3441ce3ebabf 100644
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -167,7 +167,8 @@ struct scsi_cmnd *queue_remove_exclude(Queue_t *queue, unsigned long *exclude)
         spin_lock_irqsave(&queue->queue_lock, flags);
         list_for_each(l, &queue->head) {
                 QE_t *q = list_entry(l, QE_t, list);
-                if (!test_bit(q->SCpnt->device->id * 8 + q->SCpnt->device->lun, exclude)) {
+                if (!test_bit(q->SCpnt->device->id * 8 +
+                              (u8)(q->SCpnt->device->lun & 0x7), exclude)) {
                         SCpnt = __queue_remove(queue, l);
                         break;
                 }