Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb78c16 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

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: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@infradead.org>
Reviewed-by: default avatarEwan Milne <emilne@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 755f516b

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3945,7 +3945,7 @@ void ata_scsi_hotplug(struct work_struct *work) 
 *	Zero.

 */

int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,

		       unsigned int id, unsigned int lun)

		       unsigned int id, u64 lun)

{

	struct ata_port *ap = ata_shost_to_port(shost);

	unsigned long flags;

drivers/ata/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ extern void ata_schedule_scsi_eh(struct Scsi_Host *shost); 
extern void ata_scsi_dev_rescan(struct work_struct *work);

extern int ata_bus_probe(struct ata_port *ap);

extern int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,

			      unsigned int id, unsigned int lun);

			      unsigned int id, u64 lun);





/* libata-eh.c */

drivers/message/fusion/mptbase.h

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ typedef struct _VirtTarget { 
typedef struct _VirtDevice {

	VirtTarget		*vtarget;

	u8			 configured_lun;

	int			 lun;

	u64			 lun;

} VirtDevice;



/*

drivers/message/fusion/mptfc.c

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt, 
	 || (loops > 0 && ioc->active == 0)) {

		spin_unlock_irqrestore(shost->host_lock, flags);

		dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

			"mptfc_block_error_handler.%d: %d:%d, port status is "

			"mptfc_block_error_handler.%d: %d:%llu, port status is "

			"%x, active flag %d, deferring %s recovery.\n",

			ioc->name, ioc->sh->host_no,

			SCpnt->device->id, SCpnt->device->lun,
@@ -218,7 +218,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt, 
	if (ready == DID_NO_CONNECT || !SCpnt->device->hostdata

	 || ioc->active == 0) {

		dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

			"%s.%d: %d:%d, failing recovery, "

			"%s.%d: %d:%llu, failing recovery, "

			"port state %x, active %d, vdevice %p.\n", caller,

			ioc->name, ioc->sh->host_no,

			SCpnt->device->id, SCpnt->device->lun, ready,
@@ -226,7 +226,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt, 
		return FAILED;

	}

	dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT

		"%s.%d: %d:%d, executing recovery.\n", caller,

		"%s.%d: %d:%llu, executing recovery.\n", caller,

		ioc->name, ioc->sh->host_no,

		SCpnt->device->id, SCpnt->device->lun));

	return (*func)(SCpnt);

drivers/message/fusion/mptscsih.c

+7 −7
Original line number Diff line number Diff line
@@ -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;

	}
@@ -1518,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;
@@ -2380,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
@@ -2971,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)