Skip to content

Commit 2a3d4eb

Browse files
Christoph Hellwigmartinkpetersen
Christoph Hellwig
authored and
martinkpetersen
committed
scsi: flip the default on use_clustering
Most SCSI drivers want to enable "clustering", that is merging of segments so that they might span more than a single page. Remove the ENABLE_CLUSTERING define, and require drivers to explicitly set DISABLE_CLUSTERING to disable this feature. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 4dd4130 commit 2a3d4eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+4
-110
lines changed

‎drivers/firewire/sbp2.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,6 @@ static struct scsi_host_template scsi_driver_template = {
16101610
.eh_abort_handler = sbp2_scsi_abort,
16111611
.this_id = -1,
16121612
.sg_tablesize = SG_ALL,
1613-
.use_clustering = ENABLE_CLUSTERING,
16141613
.can_queue = 1,
16151614
.sdev_attrs = sbp2_scsi_sysfs_attrs,
16161615
};

‎drivers/infiniband/ulp/iser/iscsi_iser.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,6 @@ static struct scsi_host_template iscsi_iser_sht = {
997997
.eh_device_reset_handler= iscsi_eh_device_reset,
998998
.eh_target_reset_handler = iscsi_eh_recover_target,
999999
.target_alloc = iscsi_target_alloc,
1000-
.use_clustering = ENABLE_CLUSTERING,
10011000
.slave_alloc = iscsi_iser_slave_alloc,
10021001
.proc_name = "iscsi_iser",
10031002
.this_id = -1,

‎drivers/infiniband/ulp/srp/ib_srp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3215,7 +3215,6 @@ static struct scsi_host_template srp_template = {
32153215
.can_queue = SRP_DEFAULT_CMD_SQ_SIZE,
32163216
.this_id = -1,
32173217
.cmd_per_lun = SRP_DEFAULT_CMD_SQ_SIZE,
3218-
.use_clustering = ENABLE_CLUSTERING,
32193218
.shost_attrs = srp_host_attrs,
32203219
.track_queue_depth = 1,
32213220
};

‎drivers/message/fusion/mptfc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ static struct scsi_host_template mptfc_driver_template = {
129129
.sg_tablesize = MPT_SCSI_SG_DEPTH,
130130
.max_sectors = 8192,
131131
.cmd_per_lun = 7,
132-
.use_clustering = ENABLE_CLUSTERING,
133132
.shost_attrs = mptscsih_host_attrs,
134133
};
135134

‎drivers/message/fusion/mptsas.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1992,7 +1992,6 @@ static struct scsi_host_template mptsas_driver_template = {
19921992
.sg_tablesize = MPT_SCSI_SG_DEPTH,
19931993
.max_sectors = 8192,
19941994
.cmd_per_lun = 7,
1995-
.use_clustering = ENABLE_CLUSTERING,
19961995
.shost_attrs = mptscsih_host_attrs,
19971996
.no_write_same = 1,
19981997
};

‎drivers/message/fusion/mptspi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,6 @@ static struct scsi_host_template mptspi_driver_template = {
848848
.sg_tablesize = MPT_SCSI_SG_DEPTH,
849849
.max_sectors = 8192,
850850
.cmd_per_lun = 7,
851-
.use_clustering = ENABLE_CLUSTERING,
852851
.shost_attrs = mptscsih_host_attrs,
853852
};
854853

‎drivers/s390/scsi/zfcp_scsi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ static struct scsi_host_template zfcp_scsi_host_template = {
429429
* ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8,
430430
/* GCD, adjusted later */
431431
.dma_boundary = ZFCP_QDIO_SBALE_LEN - 1,
432-
.use_clustering = 1,
433432
.shost_attrs = zfcp_sysfs_shost_attrs,
434433
.sdev_attrs = zfcp_sysfs_sdev_attrs,
435434
.track_queue_depth = 1,

‎drivers/scsi/3w-9xxx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,6 @@ static struct scsi_host_template driver_template = {
19981998
.sg_tablesize = TW_APACHE_MAX_SGL_LENGTH,
19991999
.max_sectors = TW_MAX_SECTORS,
20002000
.cmd_per_lun = TW_MAX_CMDS_PER_LUN,
2001-
.use_clustering = ENABLE_CLUSTERING,
20022001
.shost_attrs = twa_host_attrs,
20032002
.emulated = 1,
20042003
.no_write_same = 1,

‎drivers/scsi/3w-sas.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,6 @@ static struct scsi_host_template driver_template = {
15501550
.sg_tablesize = TW_LIBERATOR_MAX_SGL_LENGTH,
15511551
.max_sectors = TW_MAX_SECTORS,
15521552
.cmd_per_lun = TW_MAX_CMDS_PER_LUN,
1553-
.use_clustering = ENABLE_CLUSTERING,
15541553
.shost_attrs = twl_host_attrs,
15551554
.emulated = 1,
15561555
.no_write_same = 1,

‎drivers/scsi/3w-xxxx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,6 @@ static struct scsi_host_template driver_template = {
22472247
.sg_tablesize = TW_MAX_SGL_LENGTH,
22482248
.max_sectors = TW_MAX_SECTORS,
22492249
.cmd_per_lun = TW_MAX_CMDS_PER_LUN,
2250-
.use_clustering = ENABLE_CLUSTERING,
22512250
.shost_attrs = tw_host_attrs,
22522251
.emulated = 1,
22532252
.no_write_same = 1,

‎drivers/scsi/53c700.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ NCR_700_detect(struct scsi_host_template *tpnt,
318318
tpnt->can_queue = NCR_700_COMMAND_SLOTS_PER_HOST;
319319
tpnt->sg_tablesize = NCR_700_SG_SEGMENTS;
320320
tpnt->cmd_per_lun = NCR_700_CMD_PER_LUN;
321-
tpnt->use_clustering = ENABLE_CLUSTERING;
322321
tpnt->slave_configure = NCR_700_slave_configure;
323322
tpnt->slave_destroy = NCR_700_slave_destroy;
324323
tpnt->slave_alloc = NCR_700_slave_alloc;

‎drivers/scsi/BusLogic.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3858,7 +3858,6 @@ static struct scsi_host_template blogic_template = {
38583858
#endif
38593859
.unchecked_isa_dma = 1,
38603860
.max_sectors = 128,
3861-
.use_clustering = ENABLE_CLUSTERING,
38623861
};
38633862

38643863
/*

‎drivers/scsi/a100u2w.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,6 @@ static struct scsi_host_template inia100_template = {
10781078
.can_queue = 1,
10791079
.this_id = 1,
10801080
.sg_tablesize = SG_ALL,
1081-
.use_clustering = ENABLE_CLUSTERING,
10821081
};
10831082

10841083
static int inia100_probe_one(struct pci_dev *pdev,

‎drivers/scsi/a3000.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ static struct scsi_host_template amiga_a3000_scsi_template = {
175175
.this_id = 7,
176176
.sg_tablesize = SG_ALL,
177177
.cmd_per_lun = CMD_PER_LUN,
178-
.use_clustering = ENABLE_CLUSTERING
179178
};
180179

181180
static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)

‎drivers/scsi/aacraid/linit.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,6 @@ static struct scsi_host_template aac_driver_template = {
15401540
#else
15411541
.cmd_per_lun = AAC_NUM_IO_FIB,
15421542
#endif
1543-
.use_clustering = ENABLE_CLUSTERING,
15441543
.emulated = 1,
15451544
.no_write_same = 1,
15461545
};

‎drivers/scsi/advansys.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10808,14 +10808,6 @@ static struct scsi_host_template advansys_template = {
1080810808
* for non-ISA adapters.
1080910809
*/
1081010810
.unchecked_isa_dma = true,
10811-
/*
10812-
* All adapters controlled by this driver are capable of large
10813-
* scatter-gather lists. According to the mid-level SCSI documentation
10814-
* this obviates any performance gain provided by setting
10815-
* 'use_clustering'. But empirically while CPU utilization is increased
10816-
* by enabling clustering, I/O throughput increases as well.
10817-
*/
10818-
.use_clustering = ENABLE_CLUSTERING,
1081910811
};
1082010812

1082110813
static int advansys_wide_init_chip(struct Scsi_Host *shost)

‎drivers/scsi/aha1542.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,6 @@ static struct scsi_host_template driver_template = {
10111011
.this_id = 7,
10121012
.sg_tablesize = 16,
10131013
.unchecked_isa_dma = 1,
1014-
.use_clustering = ENABLE_CLUSTERING,
10151014
};
10161015

10171016
static int aha1542_isa_match(struct device *pdev, unsigned int ndev)

‎drivers/scsi/aha1740.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ static struct scsi_host_template aha1740_template = {
545545
.can_queue = AHA1740_ECBS,
546546
.this_id = 7,
547547
.sg_tablesize = AHA1740_SCATTER,
548-
.use_clustering = ENABLE_CLUSTERING,
549548
.eh_abort_handler = aha1740_eh_abort_handler,
550549
};
551550

‎drivers/scsi/aic7xxx/aic79xx_osm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,6 @@ struct scsi_host_template aic79xx_driver_template = {
920920
.this_id = -1,
921921
.max_sectors = 8192,
922922
.cmd_per_lun = 2,
923-
.use_clustering = ENABLE_CLUSTERING,
924923
.slave_alloc = ahd_linux_slave_alloc,
925924
.slave_configure = ahd_linux_slave_configure,
926925
.target_alloc = ahd_linux_target_alloc,

‎drivers/scsi/aic7xxx/aic7xxx_osm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,6 @@ struct scsi_host_template aic7xxx_driver_template = {
807807
.this_id = -1,
808808
.max_sectors = 8192,
809809
.cmd_per_lun = 2,
810-
.use_clustering = ENABLE_CLUSTERING,
811810
.slave_alloc = ahc_linux_slave_alloc,
812811
.slave_configure = ahc_linux_slave_configure,
813812
.target_alloc = ahc_linux_target_alloc,

‎drivers/scsi/aic94xx/aic94xx_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ static struct scsi_host_template aic94xx_sht = {
6868
.this_id = -1,
6969
.sg_tablesize = SG_ALL,
7070
.max_sectors = SCSI_DEFAULT_MAX_SECTORS,
71-
.use_clustering = ENABLE_CLUSTERING,
7271
.eh_device_reset_handler = sas_eh_device_reset_handler,
7372
.eh_target_reset_handler = sas_eh_target_reset_handler,
7473
.target_destroy = sas_target_destroy,

‎drivers/scsi/arcmsr/arcmsr_hba.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ static struct scsi_host_template arcmsr_scsi_host_template = {
156156
.sg_tablesize = ARCMSR_DEFAULT_SG_ENTRIES,
157157
.max_sectors = ARCMSR_MAX_XFER_SECTORS_C,
158158
.cmd_per_lun = ARCMSR_DEFAULT_CMD_PERLUN,
159-
.use_clustering = ENABLE_CLUSTERING,
160159
.shost_attrs = arcmsr_host_attrs,
161160
.no_write_same = 1,
162161
};

‎drivers/scsi/arm/powertec.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ static struct scsi_host_template powertecscsi_template = {
294294
.sg_tablesize = SG_MAX_SEGMENTS,
295295
.dma_boundary = IOMD_DMA_BOUNDARY,
296296
.cmd_per_lun = 2,
297-
.use_clustering = ENABLE_CLUSTERING,
298297
.proc_name = "powertec",
299298
};
300299

‎drivers/scsi/atp870u.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,6 @@ static struct scsi_host_template atp870u_template = {
16811681
.can_queue = qcnt /* can_queue */,
16821682
.this_id = 7 /* SCSI ID */,
16831683
.sg_tablesize = ATP870U_SCATTER /*SG_ALL*/ /*SG_NONE*/,
1684-
.use_clustering = ENABLE_CLUSTERING,
16851684
.max_sectors = ATP870U_MAX_SECTORS,
16861685
};
16871686

‎drivers/scsi/be2iscsi/be_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@ static struct scsi_host_template beiscsi_sht = {
405405
.this_id = -1,
406406
.max_sectors = BEISCSI_MAX_SECTORS,
407407
.cmd_per_lun = BEISCSI_CMD_PER_LUN,
408-
.use_clustering = ENABLE_CLUSTERING,
409408
.vendor_id = SCSI_NL_VID_TYPE_PCI | BE_VENDOR_ID,
410409
.track_queue_depth = 1,
411410
};

‎drivers/scsi/bfa/bfad_im.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,6 @@ struct scsi_host_template bfad_im_scsi_host_template = {
817817
.this_id = -1,
818818
.sg_tablesize = BFAD_IO_MAX_SGE,
819819
.cmd_per_lun = 3,
820-
.use_clustering = ENABLE_CLUSTERING,
821820
.shost_attrs = bfad_im_host_attrs,
822821
.max_sectors = BFAD_MAX_SECTORS,
823822
.vendor_id = BFA_PCI_VENDOR_ID_BROCADE,
@@ -840,7 +839,6 @@ struct scsi_host_template bfad_im_vport_template = {
840839
.this_id = -1,
841840
.sg_tablesize = BFAD_IO_MAX_SGE,
842841
.cmd_per_lun = 3,
843-
.use_clustering = ENABLE_CLUSTERING,
844842
.shost_attrs = bfad_im_vport_attrs,
845843
.max_sectors = BFAD_MAX_SECTORS,
846844
};

‎drivers/scsi/bnx2fc/bnx2fc_fcoe.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2970,7 +2970,6 @@ static struct scsi_host_template bnx2fc_shost_template = {
29702970
.change_queue_depth = scsi_change_queue_depth,
29712971
.this_id = -1,
29722972
.cmd_per_lun = 3,
2973-
.use_clustering = ENABLE_CLUSTERING,
29742973
.sg_tablesize = BNX2FC_MAX_BDS_PER_CMD,
29752974
.max_sectors = 1024,
29762975
.track_queue_depth = 1,

‎drivers/scsi/bnx2i/bnx2i_iscsi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2263,7 +2263,6 @@ static struct scsi_host_template bnx2i_host_template = {
22632263
.max_sectors = 127,
22642264
.cmd_per_lun = 128,
22652265
.this_id = -1,
2266-
.use_clustering = ENABLE_CLUSTERING,
22672266
.sg_tablesize = ISCSI_MAX_BDS_PER_CMD,
22682267
.shost_attrs = bnx2i_dev_attributes,
22692268
.track_queue_depth = 1,

‎drivers/scsi/csiostor/csio_scsi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,7 +2280,6 @@ struct scsi_host_template csio_fcoe_shost_template = {
22802280
.this_id = -1,
22812281
.sg_tablesize = CSIO_SCSI_MAX_SGE,
22822282
.cmd_per_lun = CSIO_MAX_CMD_PER_LUN,
2283-
.use_clustering = ENABLE_CLUSTERING,
22842283
.shost_attrs = csio_fcoe_lport_attrs,
22852284
.max_sectors = CSIO_MAX_SECTOR_SIZE,
22862285
};
@@ -2300,7 +2299,6 @@ struct scsi_host_template csio_fcoe_shost_vport_template = {
23002299
.this_id = -1,
23012300
.sg_tablesize = CSIO_SCSI_MAX_SGE,
23022301
.cmd_per_lun = CSIO_MAX_CMD_PER_LUN,
2303-
.use_clustering = ENABLE_CLUSTERING,
23042302
.shost_attrs = csio_fcoe_vport_attrs,
23052303
.max_sectors = CSIO_MAX_SECTOR_SIZE,
23062304
};

‎drivers/scsi/cxlflash/main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3180,7 +3180,6 @@ static struct scsi_host_template driver_template = {
31803180
.this_id = -1,
31813181
.sg_tablesize = 1, /* No scatter gather support */
31823182
.max_sectors = CXLFLASH_MAX_SECTORS,
3183-
.use_clustering = ENABLE_CLUSTERING,
31843183
.shost_attrs = cxlflash_host_attrs,
31853184
.sdev_attrs = cxlflash_dev_attrs,
31863185
};

‎drivers/scsi/dpt_i2o.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3569,7 +3569,6 @@ static struct scsi_host_template driver_template = {
35693569
.slave_configure = adpt_slave_configure,
35703570
.can_queue = MAX_TO_IOP_MESSAGES,
35713571
.this_id = 7,
3572-
.use_clustering = ENABLE_CLUSTERING,
35733572
};
35743573

35753574
static int __init adpt_init(void)

‎drivers/scsi/esas2r/esas2r_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ static struct scsi_host_template driver_template = {
250250
ESAS2R_DEFAULT_CMD_PER_LUN,
251251
.present = 0,
252252
.unchecked_isa_dma = 0,
253-
.use_clustering = ENABLE_CLUSTERING,
254253
.emulated = 0,
255254
.proc_name = ESAS2R_DRVR_NAME,
256255
.change_queue_depth = scsi_change_queue_depth,

‎drivers/scsi/esp_scsi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2676,7 +2676,6 @@ struct scsi_host_template scsi_esp_template = {
26762676
.can_queue = 7,
26772677
.this_id = 7,
26782678
.sg_tablesize = SG_ALL,
2679-
.use_clustering = ENABLE_CLUSTERING,
26802679
.max_sectors = 0xffff,
26812680
.skip_settle_delay = 1,
26822681
};

‎drivers/scsi/fcoe/fcoe.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ static struct scsi_host_template fcoe_shost_template = {
286286
.this_id = -1,
287287
.cmd_per_lun = 3,
288288
.can_queue = FCOE_MAX_OUTSTANDING_COMMANDS,
289-
.use_clustering = ENABLE_CLUSTERING,
290289
.sg_tablesize = SG_ALL,
291290
.max_sectors = 0xffff,
292291
.track_queue_depth = 1,

‎drivers/scsi/fnic/fnic_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ static struct scsi_host_template fnic_host_template = {
115115
.this_id = -1,
116116
.cmd_per_lun = 3,
117117
.can_queue = FNIC_DFLT_IO_REQ,
118-
.use_clustering = ENABLE_CLUSTERING,
119118
.sg_tablesize = FNIC_MAX_SG_DESC_CNT,
120119
.max_sectors = 0xffff,
121120
.shost_attrs = fnic_attrs,

‎drivers/scsi/gdth.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4680,7 +4680,6 @@ static struct scsi_host_template gdth_template = {
46804680
.sg_tablesize = GDTH_MAXSG,
46814681
.cmd_per_lun = GDTH_MAXC_P_L,
46824682
.unchecked_isa_dma = 1,
4683-
.use_clustering = ENABLE_CLUSTERING,
46844683
.no_write_same = 1,
46854684
};
46864685

‎drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,6 @@ static struct scsi_host_template sht_v1_hw = {
18181818
.this_id = -1,
18191819
.sg_tablesize = HISI_SAS_SGE_PAGE_CNT,
18201820
.max_sectors = SCSI_DEFAULT_MAX_SECTORS,
1821-
.use_clustering = ENABLE_CLUSTERING,
18221821
.eh_device_reset_handler = sas_eh_device_reset_handler,
18231822
.eh_target_reset_handler = sas_eh_target_reset_handler,
18241823
.target_destroy = sas_target_destroy,

‎drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3580,7 +3580,6 @@ static struct scsi_host_template sht_v2_hw = {
35803580
.this_id = -1,
35813581
.sg_tablesize = HISI_SAS_SGE_PAGE_CNT,
35823582
.max_sectors = SCSI_DEFAULT_MAX_SECTORS,
3583-
.use_clustering = ENABLE_CLUSTERING,
35843583
.eh_device_reset_handler = sas_eh_device_reset_handler,
35853584
.eh_target_reset_handler = sas_eh_target_reset_handler,
35863585
.target_destroy = sas_target_destroy,

‎drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2233,7 +2233,6 @@ static struct scsi_host_template sht_v3_hw = {
22332233
.this_id = -1,
22342234
.sg_tablesize = HISI_SAS_SGE_PAGE_CNT,
22352235
.max_sectors = SCSI_DEFAULT_MAX_SECTORS,
2236-
.use_clustering = ENABLE_CLUSTERING,
22372236
.eh_device_reset_handler = sas_eh_device_reset_handler,
22382237
.eh_target_reset_handler = sas_eh_target_reset_handler,
22392238
.target_destroy = sas_target_destroy,

‎drivers/scsi/hpsa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ static struct scsi_host_template hpsa_driver_template = {
965965
.scan_finished = hpsa_scan_finished,
966966
.change_queue_depth = hpsa_change_queue_depth,
967967
.this_id = -1,
968-
.use_clustering = ENABLE_CLUSTERING,
969968
.eh_device_reset_handler = hpsa_eh_device_reset_handler,
970969
.ioctl = hpsa_ioctl,
971970
.slave_alloc = hpsa_slave_alloc,

‎drivers/scsi/hptiop.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,6 @@ static struct scsi_host_template driver_template = {
11801180
.eh_host_reset_handler = hptiop_reset,
11811181
.info = hptiop_info,
11821182
.emulated = 0,
1183-
.use_clustering = ENABLE_CLUSTERING,
11841183
.proc_name = driver_name,
11851184
.shost_attrs = hptiop_attrs,
11861185
.slave_configure = hptiop_slave_config,

‎drivers/scsi/ibmvscsi/ibmvfc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3100,7 +3100,6 @@ static struct scsi_host_template driver_template = {
31003100
.this_id = -1,
31013101
.sg_tablesize = SG_ALL,
31023102
.max_sectors = IBMVFC_MAX_SECTORS,
3103-
.use_clustering = ENABLE_CLUSTERING,
31043103
.shost_attrs = ibmvfc_attrs,
31053104
.track_queue_depth = 1,
31063105
};

‎drivers/scsi/ibmvscsi/ibmvscsi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,6 @@ static struct scsi_host_template driver_template = {
20792079
.can_queue = IBMVSCSI_MAX_REQUESTS_DEFAULT,
20802080
.this_id = -1,
20812081
.sg_tablesize = SG_ALL,
2082-
.use_clustering = ENABLE_CLUSTERING,
20832082
.shost_attrs = ibmvscsi_attrs,
20842083
};
20852084

‎drivers/scsi/imm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,6 @@ static struct scsi_host_template imm_template = {
11101110
.bios_param = imm_biosparam,
11111111
.this_id = 7,
11121112
.sg_tablesize = SG_ALL,
1113-
.use_clustering = ENABLE_CLUSTERING,
11141113
.can_queue = 1,
11151114
.slave_alloc = imm_adjust_queue,
11161115
};

‎drivers/scsi/initio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2817,7 +2817,6 @@ static struct scsi_host_template initio_template = {
28172817
.can_queue = MAX_TARGETS * i91u_MAXQUEUE,
28182818
.this_id = 1,
28192819
.sg_tablesize = SG_ALL,
2820-
.use_clustering = ENABLE_CLUSTERING,
28212820
};
28222821

28232822
static int initio_probe_one(struct pci_dev *pdev,

‎drivers/scsi/ipr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6754,7 +6754,6 @@ static struct scsi_host_template driver_template = {
67546754
.sg_tablesize = IPR_MAX_SGLIST,
67556755
.max_sectors = IPR_IOA_MAX_SECTORS,
67566756
.cmd_per_lun = IPR_MAX_CMD_PER_LUN,
6757-
.use_clustering = ENABLE_CLUSTERING,
67586757
.shost_attrs = ipr_ioa_attrs,
67596758
.sdev_attrs = ipr_dev_attrs,
67606759
.proc_name = IPR_NAME,

‎drivers/scsi/ips.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ static struct scsi_host_template ips_driver_template = {
365365
.this_id = -1,
366366
.sg_tablesize = IPS_MAX_SG,
367367
.cmd_per_lun = 3,
368-
.use_clustering = ENABLE_CLUSTERING,
369368
.no_write_same = 1,
370369
};
371370

0 commit comments

Comments
 (0)