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

Commit 65e8617f authored by Ming Lin's avatar Ming Lin Committed by Martin K. Petersen
Browse files

scsi: rename SCSI_MAX_{SG, SG_CHAIN}_SEGMENTS 



Rename SCSI_MAX_SG_SEGMENTS to SG_CHUNK_SIZE, which means the amount
we fit into a single scatterlist chunk.

Rename SCSI_MAX_SG_CHAIN_SEGMENTS to SG_MAX_SEGMENTS.

Will move these 2 generic definitions to scatterlist.h later.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: Bart Van Assche <bart.vanassche@sandisk.com> (for ib_srp changes)
Signed-off-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 001d63be

drivers/ata/pata_icside.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int icside_dma_init(struct pata_icside_info *info) 


static struct scsi_host_template pata_icside_sht = {

	ATA_BASE_SHT(DRV_NAME),

	.sg_tablesize		= SCSI_MAX_SG_CHAIN_SEGMENTS,

	.sg_tablesize		= SG_MAX_SEGMENTS,

	.dma_boundary		= IOMD_DMA_BOUNDARY,

};

drivers/infiniband/ulp/srp/ib_srp.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ MODULE_PARM_DESC(cmd_sg_entries, 


module_param(indirect_sg_entries, uint, 0444);

MODULE_PARM_DESC(indirect_sg_entries,

		 "Default max number of gather/scatter entries (default is 12, max is " __stringify(SCSI_MAX_SG_CHAIN_SEGMENTS) ")");

		 "Default max number of gather/scatter entries (default is 12, max is " __stringify(SG_MAX_SEGMENTS) ")");



module_param(allow_ext_sg, bool, 0444);

MODULE_PARM_DESC(allow_ext_sg,
@@ -3097,7 +3097,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target) 


		case SRP_OPT_SG_TABLESIZE:

			if (match_int(args, &token) || token < 1 ||

					token > SCSI_MAX_SG_CHAIN_SEGMENTS) {

					token > SG_MAX_SEGMENTS) {

				pr_warn("bad max sg_tablesize parameter '%s'\n",

					p);

				goto out;

drivers/scsi/arm/cumana_2.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static struct scsi_host_template cumanascsi2_template = { 
	.eh_abort_handler		= fas216_eh_abort,

	.can_queue			= 1,

	.this_id			= 7,

	.sg_tablesize			= SCSI_MAX_SG_CHAIN_SEGMENTS,

	.sg_tablesize			= SG_MAX_SEGMENTS,

	.dma_boundary			= IOMD_DMA_BOUNDARY,

	.use_clustering			= DISABLE_CLUSTERING,

	.proc_name			= "cumanascsi2",

drivers/scsi/arm/eesox.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static struct scsi_host_template eesox_template = { 
	.eh_abort_handler		= fas216_eh_abort,

	.can_queue			= 1,

	.this_id			= 7,

	.sg_tablesize			= SCSI_MAX_SG_CHAIN_SEGMENTS,

	.sg_tablesize			= SG_MAX_SEGMENTS,

	.dma_boundary			= IOMD_DMA_BOUNDARY,

	.use_clustering			= DISABLE_CLUSTERING,

	.proc_name			= "eesox",

drivers/scsi/arm/powertec.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static struct scsi_host_template powertecscsi_template = { 


	.can_queue			= 8,

	.this_id			= 7,

	.sg_tablesize			= SCSI_MAX_SG_CHAIN_SEGMENTS,

	.sg_tablesize			= SG_MAX_SEGMENTS,

	.dma_boundary			= IOMD_DMA_BOUNDARY,

	.cmd_per_lun			= 2,

	.use_clustering			= ENABLE_CLUSTERING,