scsi: core: Move the eh_deadline module parameter definition (98663067) · Commits · 戴 / test

The eh_deadline definition occurs in the middle of the code for releasing a host. Avoid splitting the host release code by moving the definition of the eh_deadline parameter to the top of the hosts.c source file. Signed-off-by:

Bart Van Assche <bart.vanassche@sandisk.com> Reviewed-by:

Hannes Reinecke <hare@suse.com> Reviewed-by:

Johannes Thumshirn <jthumshirn@suse.de> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.com> Cc: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/hosts.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,12 @@
	#include "scsi_logging.h"		#include "scsi_logging.h"


			static int shost_eh_deadline = -1;

			module_param_named(eh_deadline, shost_eh_deadline, int, S_IRUGO\|S_IWUSR);
			MODULE_PARM_DESC(eh_deadline,
			"SCSI EH timeout in seconds (should be between 0 and 2^31-1)");

	static DEFINE_IDA(host_index_ida);		static DEFINE_IDA(host_index_ida);


	@@ -358,12 +364,6 @@ static void scsi_host_dev_release(struct device *dev)
	kfree(shost);		kfree(shost);
	}		}

	static int shost_eh_deadline = -1;

	module_param_named(eh_deadline, shost_eh_deadline, int, S_IRUGO\|S_IWUSR);
	MODULE_PARM_DESC(eh_deadline,
	"SCSI EH timeout in seconds (should be between 0 and 2^31-1)");

	static struct device_type scsi_host_type = {		static struct device_type scsi_host_type = {
	.name = "scsi_host",		.name = "scsi_host",
	.release = scsi_host_dev_release,		.release = scsi_host_dev_release,

Admin message