Commit 1d645088 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: disable automatic target scan 



On larger installations it is useful to disable automatic LUN scanning,
and only add the required LUNs via udev rules.  This can speed up bootup
dramatically.

This patch introduces a new scan module parameter value 'manual', which
works like 'none', but can be overridden by setting the 'rescan' value
from scsi_scan_target to 'SCSI_SCAN_MANUAL'.  And it updates all
relevant callers to set the 'rescan' value to 'SCSI_SCAN_MANUAL' if
invoked via the 'scan' option in sysfs.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Tested-by: default avatarLaurence Oberman <loberman@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 216fad91

drivers/infiniband/ulp/srp/ib_srp.c

+1 −1
Original line number Diff line number Diff line
@@ -2819,7 +2819,7 @@ static int srp_add_target(struct srp_host *host, struct srp_target_port *target) 
	spin_unlock(&host->target_lock);



	scsi_scan_target(&target->scsi_host->shost_gendev,

			 0, target->scsi_id, SCAN_WILD_CARD, 0);

			 0, target->scsi_id, SCAN_WILD_CARD, SCSI_SCAN_INITIAL);



	if (srp_connected_ch(target) < target->ch_count ||

	    target->qp_in_error) {

drivers/message/fusion/mptspi.c

+1 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ static void mpt_work_wrapper(struct work_struct *work) 
	}

	shost_printk(KERN_INFO, shost, MYIOC_s_FMT

	    "Integrated RAID detects new device %d\n", ioc->name, disk);

	scsi_scan_target(&ioc->sh->shost_gendev, 1, disk, 0, 1);

	scsi_scan_target(&ioc->sh->shost_gendev, 1, disk, 0, SCSI_SCAN_RESCAN);

}

drivers/s390/scsi/zfcp_unit.c

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ void zfcp_unit_scsi_scan(struct zfcp_unit *unit) 
	lun = scsilun_to_int((struct scsi_lun *) &unit->fcp_lun);



	if (rport && rport->port_state == FC_PORTSTATE_ONLINE)

		scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, lun, 1);

		scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, lun,

				 SCSI_SCAN_RESCAN);

}



static void zfcp_unit_scsi_scan_work(struct work_struct *work)

drivers/scsi/scsi_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ extern void scsi_exit_procfs(void); 
extern char scsi_scan_type[];

extern int scsi_complete_async_scans(void);

extern int scsi_scan_host_selected(struct Scsi_Host *, unsigned int,

				   unsigned int, u64, int);

				   unsigned int, u64, enum scsi_scan_mode);

extern void scsi_forget_host(struct Scsi_Host *);

extern void scsi_rescan_device(struct device *);

drivers/scsi/scsi_proc.c

+2 −1
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ static int scsi_add_single_device(uint host, uint channel, uint id, uint lun) 
	if (shost->transportt->user_scan)

		error = shost->transportt->user_scan(shost, channel, id, lun);

	else

		error = scsi_scan_host_selected(shost, channel, id, lun, 1);

		error = scsi_scan_host_selected(shost, channel, id, lun,

						SCSI_SCAN_MANUAL);

	scsi_host_put(shost);

	return error;

}