2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 0ca64484cfa3..5d7fbe4e907e 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -418,7 +418,8 @@ void zfcp_dbf_scsi(char *tag, struct scsi_cmnd *sc, struct zfcp_fsf_req *fsf)
         rec->scsi_retries = sc->retries;
         rec->scsi_allowed = sc->allowed;
         rec->scsi_id = sc->device->id;
-        rec->scsi_lun = sc->device->lun;
+        /* struct zfcp_dbf_scsi needs to be updated to handle 64bit LUNs */
+        rec->scsi_lun = (u32)sc->device->lun;
         rec->host_scribble = (unsigned long)sc->host_scribble;
 
         memcpy(rec->scsi_opcode, sc->cmnd,
diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c
index 39f5446f7216..157d3d203ba1 100644
--- a/drivers/s390/scsi/zfcp_unit.c
+++ b/drivers/s390/scsi/zfcp_unit.c
@@ -21,7 +21,7 @@
 void zfcp_unit_scsi_scan(struct zfcp_unit *unit)
 {
         struct fc_rport *rport = unit->port->rport;
-        unsigned int lun;
+        u64 lun;
 
         lun = scsilun_to_int((struct scsi_lun *) &unit->fcp_lun);
 
@@ -188,7 +188,7 @@ struct scsi_device *zfcp_unit_sdev(struct zfcp_unit *unit)
 {
         struct Scsi_Host *shost;
         struct zfcp_port *port;
-        unsigned int lun;
+        u64 lun;
 
         lun = scsilun_to_int((struct scsi_lun *) &unit->fcp_lun);
         port = unit->port;