scsi: flip the default on use_clustering

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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>

authored by

Christoph Hellwig and committed by

Martin K. Petersen 7 years ago 2a3d4eb8 4dd4130a

+4 -110

82 changed files

expand all collapse all

drivers

firewire

sbp2.c

infiniband

ulp

iser

iscsi_iser.c

srp

ib_srp.c

message

fusion

mptfc.c

mptsas.c

mptspi.c

s390

scsi

zfcp_scsi.c

scsi

3w-9xxx.c

3w-sas.c

3w-xxxx.c

53c700.c

BusLogic.c

a100u2w.c

a3000.c

aacraid

linit.c

advansys.c

aha1542.c

aha1740.c

aic7xxx

aic79xx_osm.c

aic7xxx_osm.c

aic94xx

aic94xx_init.c

arcmsr

arcmsr_hba.c

arm

powertec.c

atp870u.c

be2iscsi

be_main.c

bfa

bfad_im.c

bnx2fc

bnx2fc_fcoe.c

bnx2i

bnx2i_iscsi.c

csiostor

csio_scsi.c

cxlflash

main.c

dpt_i2o.c

esas2r

esas2r_main.c

esp_scsi.c

fcoe

fcoe.c

fnic

fnic_main.c

gdth.c

hisi_sas

hisi_sas_v1_hw.c

hisi_sas_v2_hw.c

hisi_sas_v3_hw.c

hpsa.c

hptiop.c

ibmvscsi

ibmvfc.c

ibmvscsi.c

imm.c

initio.c

ipr.c

ips.c

isci

init.c

lpfc

lpfc_scsi.c

megaraid

megaraid_mbox.c

megaraid_sas_base.c

megaraid.c

mpt3sas

mpt3sas_scsih.c

mvme147.c

mvsas

mv_init.c

ncr53c8xx.c

pcmcia

sym53c500_cs.c

pm8001

pm8001_init.c

pmcraid.c

ppa.c

ps3rom.c

qedf

qedf_main.c

qedi

qedi_iscsi.c

qla1280.c

qla2xxx

qla_os.c

qla4xxx

ql4_os.c

qlogicpti.c

scsi_debug.c

scsi_lib.c

smartpqi

smartpqi_init.c

snic

snic_main.c

storvsc_drv.c

sym53c8xx_2

sym_glue.c

virtio_scsi.c

vmw_pvscsi.c

wd719x.c

staging

rts5208

rtsx.c

unisys

visorhba

visorhba_main.c

usb

image

microtek.c

storage

scsiglue.c

include

linux

libata.h

scsi

scsi_host.h

-1

drivers/firewire/sbp2.c

reviewed

··· 1610 1610 .eh_abort_handler = sbp2_scsi_abort, 1611 1611 .this_id = -1, 1612 1612 .sg_tablesize = SG_ALL, 1613 1613 - .use_clustering = ENABLE_CLUSTERING, 1614 1613 .can_queue = 1, 1615 1614 .sdev_attrs = sbp2_scsi_sysfs_attrs, 1616 1615 };

-1

drivers/infiniband/ulp/iser/iscsi_iser.c

reviewed

··· 997 997 .eh_device_reset_handler= iscsi_eh_device_reset, 998 998 .eh_target_reset_handler = iscsi_eh_recover_target, 999 999 .target_alloc = iscsi_target_alloc, 1000 1000 - .use_clustering = ENABLE_CLUSTERING, 1001 1000 .slave_alloc = iscsi_iser_slave_alloc, 1002 1001 .proc_name = "iscsi_iser", 1003 1002 .this_id = -1,

-1

drivers/infiniband/ulp/srp/ib_srp.c

reviewed

··· 3215 3215 .can_queue = SRP_DEFAULT_CMD_SQ_SIZE, 3216 3216 .this_id = -1, 3217 3217 .cmd_per_lun = SRP_DEFAULT_CMD_SQ_SIZE, 3218 3218 - .use_clustering = ENABLE_CLUSTERING, 3219 3218 .shost_attrs = srp_host_attrs, 3220 3219 .track_queue_depth = 1, 3221 3220 };

-1

drivers/message/fusion/mptfc.c

reviewed

··· 129 129 .sg_tablesize = MPT_SCSI_SG_DEPTH, 130 130 .max_sectors = 8192, 131 131 .cmd_per_lun = 7, 132 132 - .use_clustering = ENABLE_CLUSTERING, 133 132 .shost_attrs = mptscsih_host_attrs, 134 133 }; 135 134

-1

drivers/message/fusion/mptsas.c

reviewed

··· 1992 1992 .sg_tablesize = MPT_SCSI_SG_DEPTH, 1993 1993 .max_sectors = 8192, 1994 1994 .cmd_per_lun = 7, 1995 1995 - .use_clustering = ENABLE_CLUSTERING, 1996 1995 .shost_attrs = mptscsih_host_attrs, 1997 1996 .no_write_same = 1, 1998 1997 };

-1

drivers/message/fusion/mptspi.c

reviewed

··· 848 848 .sg_tablesize = MPT_SCSI_SG_DEPTH, 849 849 .max_sectors = 8192, 850 850 .cmd_per_lun = 7, 851 851 - .use_clustering = ENABLE_CLUSTERING, 852 851 .shost_attrs = mptscsih_host_attrs, 853 852 }; 854 853

-1

drivers/s390/scsi/zfcp_scsi.c

reviewed

··· 429 429 * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8, 430 430 /* GCD, adjusted later */ 431 431 .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, 432 432 - .use_clustering = 1, 433 432 .shost_attrs = zfcp_sysfs_shost_attrs, 434 433 .sdev_attrs = zfcp_sysfs_sdev_attrs, 435 434 .track_queue_depth = 1,

-1

drivers/scsi/3w-9xxx.c

reviewed

··· 1998 1998 .sg_tablesize = TW_APACHE_MAX_SGL_LENGTH, 1999 1999 .max_sectors = TW_MAX_SECTORS, 2000 2000 .cmd_per_lun = TW_MAX_CMDS_PER_LUN, 2001 2001 - .use_clustering = ENABLE_CLUSTERING, 2002 2001 .shost_attrs = twa_host_attrs, 2003 2002 .emulated = 1, 2004 2003 .no_write_same = 1,

-1

drivers/scsi/3w-sas.c

reviewed

··· 1550 1550 .sg_tablesize = TW_LIBERATOR_MAX_SGL_LENGTH, 1551 1551 .max_sectors = TW_MAX_SECTORS, 1552 1552 .cmd_per_lun = TW_MAX_CMDS_PER_LUN, 1553 1553 - .use_clustering = ENABLE_CLUSTERING, 1554 1553 .shost_attrs = twl_host_attrs, 1555 1554 .emulated = 1, 1556 1555 .no_write_same = 1,

-1

drivers/scsi/3w-xxxx.c

reviewed

··· 2247 2247 .sg_tablesize = TW_MAX_SGL_LENGTH, 2248 2248 .max_sectors = TW_MAX_SECTORS, 2249 2249 .cmd_per_lun = TW_MAX_CMDS_PER_LUN, 2250 2250 - .use_clustering = ENABLE_CLUSTERING, 2251 2250 .shost_attrs = tw_host_attrs, 2252 2251 .emulated = 1, 2253 2252 .no_write_same = 1,

-1

drivers/scsi/53c700.c

reviewed

··· 318 318 tpnt->can_queue = NCR_700_COMMAND_SLOTS_PER_HOST; 319 319 tpnt->sg_tablesize = NCR_700_SG_SEGMENTS; 320 320 tpnt->cmd_per_lun = NCR_700_CMD_PER_LUN; 321 321 - tpnt->use_clustering = ENABLE_CLUSTERING; 322 321 tpnt->slave_configure = NCR_700_slave_configure; 323 322 tpnt->slave_destroy = NCR_700_slave_destroy; 324 323 tpnt->slave_alloc = NCR_700_slave_alloc;

-1

drivers/scsi/BusLogic.c

reviewed

··· 3858 3858 #endif 3859 3859 .unchecked_isa_dma = 1, 3860 3860 .max_sectors = 128, 3861 3861 - .use_clustering = ENABLE_CLUSTERING, 3862 3861 }; 3863 3862 3864 3863 /*

-1

drivers/scsi/a100u2w.c

reviewed

··· 1078 1078 .can_queue = 1, 1079 1079 .this_id = 1, 1080 1080 .sg_tablesize = SG_ALL, 1081 1081 - .use_clustering = ENABLE_CLUSTERING, 1082 1081 }; 1083 1082 1084 1083 static int inia100_probe_one(struct pci_dev *pdev,

-1

drivers/scsi/a3000.c

reviewed

··· 175 175 .this_id = 7, 176 176 .sg_tablesize = SG_ALL, 177 177 .cmd_per_lun = CMD_PER_LUN, 178 178 - .use_clustering = ENABLE_CLUSTERING 179 178 }; 180 179 181 180 static int __init amiga_a3000_scsi_probe(struct platform_device *pdev)

-1

drivers/scsi/aacraid/linit.c

reviewed

··· 1540 1540 #else 1541 1541 .cmd_per_lun = AAC_NUM_IO_FIB, 1542 1542 #endif 1543 1543 - .use_clustering = ENABLE_CLUSTERING, 1544 1543 .emulated = 1, 1545 1544 .no_write_same = 1, 1546 1545 };

-8

drivers/scsi/advansys.c

reviewed

··· 10808 10808 * for non-ISA adapters. 10809 10809 */ 10810 10810 .unchecked_isa_dma = true, 10811 10811 - /* 10812 10812 - * All adapters controlled by this driver are capable of large 10813 10813 - * scatter-gather lists. According to the mid-level SCSI documentation 10814 10814 - * this obviates any performance gain provided by setting 10815 10815 - * 'use_clustering'. But empirically while CPU utilization is increased 10816 10816 - * by enabling clustering, I/O throughput increases as well. 10817 10817 - */ 10818 10818 - .use_clustering = ENABLE_CLUSTERING, 10819 10811 }; 10820 10812 10821 10813 static int advansys_wide_init_chip(struct Scsi_Host *shost)

-1

drivers/scsi/aha1542.c

reviewed

··· 1011 1011 .this_id = 7, 1012 1012 .sg_tablesize = 16, 1013 1013 .unchecked_isa_dma = 1, 1014 1014 - .use_clustering = ENABLE_CLUSTERING, 1015 1014 }; 1016 1015 1017 1016 static int aha1542_isa_match(struct device *pdev, unsigned int ndev)

-1

drivers/scsi/aha1740.c

reviewed

··· 545 545 .can_queue = AHA1740_ECBS, 546 546 .this_id = 7, 547 547 .sg_tablesize = AHA1740_SCATTER, 548 548 - .use_clustering = ENABLE_CLUSTERING, 549 548 .eh_abort_handler = aha1740_eh_abort_handler, 550 549 }; 551 550

-1

drivers/scsi/aic7xxx/aic79xx_osm.c

reviewed

··· 920 920 .this_id = -1, 921 921 .max_sectors = 8192, 922 922 .cmd_per_lun = 2, 923 923 - .use_clustering = ENABLE_CLUSTERING, 924 923 .slave_alloc = ahd_linux_slave_alloc, 925 924 .slave_configure = ahd_linux_slave_configure, 926 925 .target_alloc = ahd_linux_target_alloc,

-1

drivers/scsi/aic7xxx/aic7xxx_osm.c

reviewed

··· 807 807 .this_id = -1, 808 808 .max_sectors = 8192, 809 809 .cmd_per_lun = 2, 810 810 - .use_clustering = ENABLE_CLUSTERING, 811 810 .slave_alloc = ahc_linux_slave_alloc, 812 811 .slave_configure = ahc_linux_slave_configure, 813 812 .target_alloc = ahc_linux_target_alloc,

-1

drivers/scsi/aic94xx/aic94xx_init.c

reviewed

··· 68 68 .this_id = -1, 69 69 .sg_tablesize = SG_ALL, 70 70 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 71 71 - .use_clustering = ENABLE_CLUSTERING, 72 71 .eh_device_reset_handler = sas_eh_device_reset_handler, 73 72 .eh_target_reset_handler = sas_eh_target_reset_handler, 74 73 .target_destroy = sas_target_destroy,

-1

drivers/scsi/arcmsr/arcmsr_hba.c

reviewed

··· 156 156 .sg_tablesize = ARCMSR_DEFAULT_SG_ENTRIES, 157 157 .max_sectors = ARCMSR_MAX_XFER_SECTORS_C, 158 158 .cmd_per_lun = ARCMSR_DEFAULT_CMD_PERLUN, 159 159 - .use_clustering = ENABLE_CLUSTERING, 160 159 .shost_attrs = arcmsr_host_attrs, 161 160 .no_write_same = 1, 162 161 };

-1

drivers/scsi/arm/powertec.c

reviewed

··· 294 294 .sg_tablesize = SG_MAX_SEGMENTS, 295 295 .dma_boundary = IOMD_DMA_BOUNDARY, 296 296 .cmd_per_lun = 2, 297 297 - .use_clustering = ENABLE_CLUSTERING, 298 297 .proc_name = "powertec", 299 298 }; 300 299

-1

drivers/scsi/atp870u.c

reviewed

··· 1681 1681 .can_queue = qcnt /* can_queue */, 1682 1682 .this_id = 7 /* SCSI ID */, 1683 1683 .sg_tablesize = ATP870U_SCATTER /*SG_ALL*/ /*SG_NONE*/, 1684 1684 - .use_clustering = ENABLE_CLUSTERING, 1685 1684 .max_sectors = ATP870U_MAX_SECTORS, 1686 1685 }; 1687 1686

-1

drivers/scsi/be2iscsi/be_main.c

reviewed

··· 405 405 .this_id = -1, 406 406 .max_sectors = BEISCSI_MAX_SECTORS, 407 407 .cmd_per_lun = BEISCSI_CMD_PER_LUN, 408 408 - .use_clustering = ENABLE_CLUSTERING, 409 408 .vendor_id = SCSI_NL_VID_TYPE_PCI | BE_VENDOR_ID, 410 409 .track_queue_depth = 1, 411 410 };

-2

drivers/scsi/bfa/bfad_im.c

reviewed

··· 817 817 .this_id = -1, 818 818 .sg_tablesize = BFAD_IO_MAX_SGE, 819 819 .cmd_per_lun = 3, 820 820 - .use_clustering = ENABLE_CLUSTERING, 821 820 .shost_attrs = bfad_im_host_attrs, 822 821 .max_sectors = BFAD_MAX_SECTORS, 823 822 .vendor_id = BFA_PCI_VENDOR_ID_BROCADE, ··· 839 840 .this_id = -1, 840 841 .sg_tablesize = BFAD_IO_MAX_SGE, 841 842 .cmd_per_lun = 3, 842 842 - .use_clustering = ENABLE_CLUSTERING, 843 843 .shost_attrs = bfad_im_vport_attrs, 844 844 .max_sectors = BFAD_MAX_SECTORS, 845 845 };

-1

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

reviewed

··· 2970 2970 .change_queue_depth = scsi_change_queue_depth, 2971 2971 .this_id = -1, 2972 2972 .cmd_per_lun = 3, 2973 2973 - .use_clustering = ENABLE_CLUSTERING, 2974 2973 .sg_tablesize = BNX2FC_MAX_BDS_PER_CMD, 2975 2974 .max_sectors = 1024, 2976 2975 .track_queue_depth = 1,

-1

drivers/scsi/bnx2i/bnx2i_iscsi.c

reviewed

··· 2263 2263 .max_sectors = 127, 2264 2264 .cmd_per_lun = 128, 2265 2265 .this_id = -1, 2266 2266 - .use_clustering = ENABLE_CLUSTERING, 2267 2266 .sg_tablesize = ISCSI_MAX_BDS_PER_CMD, 2268 2267 .shost_attrs = bnx2i_dev_attributes, 2269 2268 .track_queue_depth = 1,

-2

drivers/scsi/csiostor/csio_scsi.c

reviewed

··· 2280 2280 .this_id = -1, 2281 2281 .sg_tablesize = CSIO_SCSI_MAX_SGE, 2282 2282 .cmd_per_lun = CSIO_MAX_CMD_PER_LUN, 2283 2283 - .use_clustering = ENABLE_CLUSTERING, 2284 2283 .shost_attrs = csio_fcoe_lport_attrs, 2285 2284 .max_sectors = CSIO_MAX_SECTOR_SIZE, 2286 2285 }; ··· 2299 2300 .this_id = -1, 2300 2301 .sg_tablesize = CSIO_SCSI_MAX_SGE, 2301 2302 .cmd_per_lun = CSIO_MAX_CMD_PER_LUN, 2302 2302 - .use_clustering = ENABLE_CLUSTERING, 2303 2303 .shost_attrs = csio_fcoe_vport_attrs, 2304 2304 .max_sectors = CSIO_MAX_SECTOR_SIZE, 2305 2305 };

-1

drivers/scsi/cxlflash/main.c

reviewed

··· 3180 3180 .this_id = -1, 3181 3181 .sg_tablesize = 1, /* No scatter gather support */ 3182 3182 .max_sectors = CXLFLASH_MAX_SECTORS, 3183 3183 - .use_clustering = ENABLE_CLUSTERING, 3184 3183 .shost_attrs = cxlflash_host_attrs, 3185 3184 .sdev_attrs = cxlflash_dev_attrs, 3186 3185 };

-1

drivers/scsi/dpt_i2o.c

reviewed

··· 3569 3569 .slave_configure = adpt_slave_configure, 3570 3570 .can_queue = MAX_TO_IOP_MESSAGES, 3571 3571 .this_id = 7, 3572 3572 - .use_clustering = ENABLE_CLUSTERING, 3573 3572 }; 3574 3573 3575 3574 static int __init adpt_init(void)

-1

drivers/scsi/esas2r/esas2r_main.c

reviewed

··· 250 250 ESAS2R_DEFAULT_CMD_PER_LUN, 251 251 .present = 0, 252 252 .unchecked_isa_dma = 0, 253 253 - .use_clustering = ENABLE_CLUSTERING, 254 253 .emulated = 0, 255 254 .proc_name = ESAS2R_DRVR_NAME, 256 255 .change_queue_depth = scsi_change_queue_depth,

-1

drivers/scsi/esp_scsi.c

reviewed

··· 2676 2676 .can_queue = 7, 2677 2677 .this_id = 7, 2678 2678 .sg_tablesize = SG_ALL, 2679 2679 - .use_clustering = ENABLE_CLUSTERING, 2680 2679 .max_sectors = 0xffff, 2681 2680 .skip_settle_delay = 1, 2682 2681 };

-1

drivers/scsi/fcoe/fcoe.c

reviewed

··· 286 286 .this_id = -1, 287 287 .cmd_per_lun = 3, 288 288 .can_queue = FCOE_MAX_OUTSTANDING_COMMANDS, 289 289 - .use_clustering = ENABLE_CLUSTERING, 290 289 .sg_tablesize = SG_ALL, 291 290 .max_sectors = 0xffff, 292 291 .track_queue_depth = 1,

-1

drivers/scsi/fnic/fnic_main.c

reviewed

··· 115 115 .this_id = -1, 116 116 .cmd_per_lun = 3, 117 117 .can_queue = FNIC_DFLT_IO_REQ, 118 118 - .use_clustering = ENABLE_CLUSTERING, 119 118 .sg_tablesize = FNIC_MAX_SG_DESC_CNT, 120 119 .max_sectors = 0xffff, 121 120 .shost_attrs = fnic_attrs,

-1

drivers/scsi/gdth.c

reviewed

··· 4680 4680 .sg_tablesize = GDTH_MAXSG, 4681 4681 .cmd_per_lun = GDTH_MAXC_P_L, 4682 4682 .unchecked_isa_dma = 1, 4683 4683 - .use_clustering = ENABLE_CLUSTERING, 4684 4683 .no_write_same = 1, 4685 4684 }; 4686 4685

-1

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

reviewed

··· 1818 1818 .this_id = -1, 1819 1819 .sg_tablesize = HISI_SAS_SGE_PAGE_CNT, 1820 1820 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 1821 1821 - .use_clustering = ENABLE_CLUSTERING, 1822 1821 .eh_device_reset_handler = sas_eh_device_reset_handler, 1823 1822 .eh_target_reset_handler = sas_eh_target_reset_handler, 1824 1823 .target_destroy = sas_target_destroy,

-1

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

reviewed

··· 3580 3580 .this_id = -1, 3581 3581 .sg_tablesize = HISI_SAS_SGE_PAGE_CNT, 3582 3582 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 3583 3583 - .use_clustering = ENABLE_CLUSTERING, 3584 3583 .eh_device_reset_handler = sas_eh_device_reset_handler, 3585 3584 .eh_target_reset_handler = sas_eh_target_reset_handler, 3586 3585 .target_destroy = sas_target_destroy,

-1

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

reviewed

··· 2233 2233 .this_id = -1, 2234 2234 .sg_tablesize = HISI_SAS_SGE_PAGE_CNT, 2235 2235 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 2236 2236 - .use_clustering = ENABLE_CLUSTERING, 2237 2236 .eh_device_reset_handler = sas_eh_device_reset_handler, 2238 2237 .eh_target_reset_handler = sas_eh_target_reset_handler, 2239 2238 .target_destroy = sas_target_destroy,

-1

drivers/scsi/hpsa.c

reviewed

··· 965 965 .scan_finished = hpsa_scan_finished, 966 966 .change_queue_depth = hpsa_change_queue_depth, 967 967 .this_id = -1, 968 968 - .use_clustering = ENABLE_CLUSTERING, 969 968 .eh_device_reset_handler = hpsa_eh_device_reset_handler, 970 969 .ioctl = hpsa_ioctl, 971 970 .slave_alloc = hpsa_slave_alloc,

-1

drivers/scsi/hptiop.c

reviewed

··· 1180 1180 .eh_host_reset_handler = hptiop_reset, 1181 1181 .info = hptiop_info, 1182 1182 .emulated = 0, 1183 1183 - .use_clustering = ENABLE_CLUSTERING, 1184 1183 .proc_name = driver_name, 1185 1184 .shost_attrs = hptiop_attrs, 1186 1185 .slave_configure = hptiop_slave_config,

-1

drivers/scsi/ibmvscsi/ibmvfc.c

reviewed

··· 3100 3100 .this_id = -1, 3101 3101 .sg_tablesize = SG_ALL, 3102 3102 .max_sectors = IBMVFC_MAX_SECTORS, 3103 3103 - .use_clustering = ENABLE_CLUSTERING, 3104 3103 .shost_attrs = ibmvfc_attrs, 3105 3104 .track_queue_depth = 1, 3106 3105 };

-1

drivers/scsi/ibmvscsi/ibmvscsi.c

reviewed

··· 2079 2079 .can_queue = IBMVSCSI_MAX_REQUESTS_DEFAULT, 2080 2080 .this_id = -1, 2081 2081 .sg_tablesize = SG_ALL, 2082 2082 - .use_clustering = ENABLE_CLUSTERING, 2083 2082 .shost_attrs = ibmvscsi_attrs, 2084 2083 }; 2085 2084

-1

drivers/scsi/imm.c

reviewed

··· 1110 1110 .bios_param = imm_biosparam, 1111 1111 .this_id = 7, 1112 1112 .sg_tablesize = SG_ALL, 1113 1113 - .use_clustering = ENABLE_CLUSTERING, 1114 1113 .can_queue = 1, 1115 1114 .slave_alloc = imm_adjust_queue, 1116 1115 };

-1

drivers/scsi/initio.c

reviewed

··· 2817 2817 .can_queue = MAX_TARGETS * i91u_MAXQUEUE, 2818 2818 .this_id = 1, 2819 2819 .sg_tablesize = SG_ALL, 2820 2820 - .use_clustering = ENABLE_CLUSTERING, 2821 2820 }; 2822 2821 2823 2822 static int initio_probe_one(struct pci_dev *pdev,

-1

drivers/scsi/ipr.c

reviewed

··· 6754 6754 .sg_tablesize = IPR_MAX_SGLIST, 6755 6755 .max_sectors = IPR_IOA_MAX_SECTORS, 6756 6756 .cmd_per_lun = IPR_MAX_CMD_PER_LUN, 6757 6757 - .use_clustering = ENABLE_CLUSTERING, 6758 6757 .shost_attrs = ipr_ioa_attrs, 6759 6758 .sdev_attrs = ipr_dev_attrs, 6760 6759 .proc_name = IPR_NAME,

-1

drivers/scsi/ips.c

reviewed

··· 365 365 .this_id = -1, 366 366 .sg_tablesize = IPS_MAX_SG, 367 367 .cmd_per_lun = 3, 368 368 - .use_clustering = ENABLE_CLUSTERING, 369 368 .no_write_same = 1, 370 369 }; 371 370

-1

drivers/scsi/isci/init.c

reviewed

··· 163 163 .this_id = -1, 164 164 .sg_tablesize = SG_ALL, 165 165 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 166 166 - .use_clustering = ENABLE_CLUSTERING, 167 166 .eh_abort_handler = sas_eh_abort_handler, 168 167 .eh_device_reset_handler = sas_eh_device_reset_handler, 169 168 .eh_target_reset_handler = sas_eh_target_reset_handler,

-4

drivers/scsi/lpfc/lpfc_scsi.c

reviewed

··· 6054 6054 .this_id = -1, 6055 6055 .sg_tablesize = 1, 6056 6056 .cmd_per_lun = 1, 6057 6057 - .use_clustering = ENABLE_CLUSTERING, 6058 6057 .shost_attrs = lpfc_hba_attrs, 6059 6058 .max_sectors = 0xFFFF, 6060 6059 .vendor_id = LPFC_NL_VENDOR_ID, ··· 6078 6079 .this_id = -1, 6079 6080 .sg_tablesize = LPFC_DEFAULT_SG_SEG_CNT, 6080 6081 .cmd_per_lun = LPFC_CMD_PER_LUN, 6081 6081 - .use_clustering = ENABLE_CLUSTERING, 6082 6082 .shost_attrs = lpfc_hba_attrs, 6083 6083 .max_sectors = 0xFFFF, 6084 6084 .vendor_id = LPFC_NL_VENDOR_ID, ··· 6104 6106 .this_id = -1, 6105 6107 .sg_tablesize = LPFC_DEFAULT_SG_SEG_CNT, 6106 6108 .cmd_per_lun = LPFC_CMD_PER_LUN, 6107 6107 - .use_clustering = ENABLE_CLUSTERING, 6108 6109 .shost_attrs = lpfc_hba_attrs, 6109 6110 .max_sectors = 0xFFFF, 6110 6111 .vendor_id = LPFC_NL_VENDOR_ID, ··· 6128 6131 .this_id = -1, 6129 6132 .sg_tablesize = LPFC_DEFAULT_SG_SEG_CNT, 6130 6133 .cmd_per_lun = LPFC_CMD_PER_LUN, 6131 6131 - .use_clustering = ENABLE_CLUSTERING, 6132 6134 .shost_attrs = lpfc_vport_attrs, 6133 6135 .max_sectors = 0xFFFF, 6134 6136 .change_queue_depth = scsi_change_queue_depth,

-1

drivers/scsi/megaraid.c

reviewed

··· 4148 4148 .this_id = DEFAULT_INITIATOR_ID, 4149 4149 .sg_tablesize = MAX_SGLIST, 4150 4150 .cmd_per_lun = DEF_CMD_PER_LUN, 4151 4151 - .use_clustering = ENABLE_CLUSTERING, 4152 4151 .eh_abort_handler = megaraid_abort, 4153 4152 .eh_device_reset_handler = megaraid_reset, 4154 4153 .eh_bus_reset_handler = megaraid_reset,

-1

drivers/scsi/megaraid/megaraid_mbox.c

reviewed

··· 336 336 .eh_abort_handler = megaraid_abort_handler, 337 337 .eh_host_reset_handler = megaraid_reset_handler, 338 338 .change_queue_depth = scsi_change_queue_depth, 339 339 - .use_clustering = ENABLE_CLUSTERING, 340 339 .no_write_same = 1, 341 340 .sdev_attrs = megaraid_sdev_attrs, 342 341 .shost_attrs = megaraid_shost_attrs,

-1

drivers/scsi/megaraid/megaraid_sas_base.c

reviewed

··· 3189 3189 .eh_timed_out = megasas_reset_timer, 3190 3190 .shost_attrs = megaraid_host_attrs, 3191 3191 .bios_param = megasas_bios_param, 3192 3192 - .use_clustering = ENABLE_CLUSTERING, 3193 3192 .change_queue_depth = scsi_change_queue_depth, 3194 3193 .no_write_same = 1, 3195 3194 };

-2

drivers/scsi/mpt3sas/mpt3sas_scsih.c

reviewed

··· 10173 10173 .sg_tablesize = MPT2SAS_SG_DEPTH, 10174 10174 .max_sectors = 32767, 10175 10175 .cmd_per_lun = 7, 10176 10176 - .use_clustering = ENABLE_CLUSTERING, 10177 10176 .shost_attrs = mpt3sas_host_attrs, 10178 10177 .sdev_attrs = mpt3sas_dev_attrs, 10179 10178 .track_queue_depth = 1, ··· 10211 10212 .sg_tablesize = MPT3SAS_SG_DEPTH, 10212 10213 .max_sectors = 32767, 10213 10214 .cmd_per_lun = 7, 10214 10214 - .use_clustering = ENABLE_CLUSTERING, 10215 10215 .shost_attrs = mpt3sas_host_attrs, 10216 10216 .sdev_attrs = mpt3sas_dev_attrs, 10217 10217 .track_queue_depth = 1,

-1

drivers/scsi/mvme147.c

reviewed

··· 78 78 .this_id = 7, 79 79 .sg_tablesize = SG_ALL, 80 80 .cmd_per_lun = CMD_PER_LUN, 81 81 - .use_clustering = ENABLE_CLUSTERING 82 81 }; 83 82 84 83 static struct Scsi_Host *mvme147_shost;

-1

drivers/scsi/mvsas/mv_init.c

reviewed

··· 59 59 .this_id = -1, 60 60 .sg_tablesize = SG_ALL, 61 61 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 62 62 - .use_clustering = ENABLE_CLUSTERING, 63 62 .eh_device_reset_handler = sas_eh_device_reset_handler, 64 63 .eh_target_reset_handler = sas_eh_target_reset_handler, 65 64 .target_destroy = sas_target_destroy,

-1

drivers/scsi/ncr53c8xx.c

reviewed

··· 8313 8313 tpnt->this_id = 7; 8314 8314 tpnt->sg_tablesize = SCSI_NCR_SG_TABLESIZE; 8315 8315 tpnt->cmd_per_lun = SCSI_NCR_CMD_PER_LUN; 8316 8316 - tpnt->use_clustering = ENABLE_CLUSTERING; 8317 8316 8318 8317 if (device->differential) 8319 8318 driver_setup.diff_support = device->differential;

-1

drivers/scsi/pcmcia/sym53c500_cs.c

reviewed

··· 680 680 .can_queue = 1, 681 681 .this_id = 7, 682 682 .sg_tablesize = 32, 683 683 - .use_clustering = ENABLE_CLUSTERING, 684 683 .shost_attrs = SYM53C500_shost_attrs 685 684 }; 686 685

-1

drivers/scsi/pm8001/pm8001_init.c

reviewed

··· 84 84 .this_id = -1, 85 85 .sg_tablesize = SG_ALL, 86 86 .max_sectors = SCSI_DEFAULT_MAX_SECTORS, 87 87 - .use_clustering = ENABLE_CLUSTERING, 88 87 .eh_device_reset_handler = sas_eh_device_reset_handler, 89 88 .eh_target_reset_handler = sas_eh_target_reset_handler, 90 89 .target_destroy = sas_target_destroy,

-1

drivers/scsi/pmcraid.c

reviewed

··· 4149 4149 .max_sectors = PMCRAID_IOA_MAX_SECTORS, 4150 4150 .no_write_same = 1, 4151 4151 .cmd_per_lun = PMCRAID_MAX_CMD_PER_LUN, 4152 4152 - .use_clustering = ENABLE_CLUSTERING, 4153 4152 .shost_attrs = pmcraid_host_attrs, 4154 4153 .proc_name = PMCRAID_DRIVER_NAME, 4155 4154 };

-1

drivers/scsi/ppa.c

reviewed

··· 978 978 .bios_param = ppa_biosparam, 979 979 .this_id = -1, 980 980 .sg_tablesize = SG_ALL, 981 981 - .use_clustering = ENABLE_CLUSTERING, 982 981 .can_queue = 1, 983 982 .slave_alloc = ppa_adjust_queue, 984 983 };

-1

drivers/scsi/ps3rom.c

reviewed

··· 349 349 .sg_tablesize = SG_ALL, 350 350 .emulated = 1, /* only sg driver uses this */ 351 351 .max_sectors = PS3ROM_MAX_SECTORS, 352 352 - .use_clustering = ENABLE_CLUSTERING, 353 352 .module = THIS_MODULE, 354 353 }; 355 354

-1

drivers/scsi/qedf/qedf_main.c

reviewed

··· 785 785 .name = QEDF_MODULE_NAME, 786 786 .this_id = -1, 787 787 .cmd_per_lun = 32, 788 788 - .use_clustering = ENABLE_CLUSTERING, 789 788 .max_sectors = 0xffff, 790 789 .queuecommand = qedf_queuecommand, 791 790 .shost_attrs = qedf_host_attrs,

-1

drivers/scsi/qedi/qedi_iscsi.c

reviewed

··· 61 61 .max_sectors = 0xffff, 62 62 .dma_boundary = QEDI_HW_DMA_BOUNDARY, 63 63 .cmd_per_lun = 128, 64 64 - .use_clustering = ENABLE_CLUSTERING, 65 64 .shost_attrs = qedi_shost_attrs, 66 65 }; 67 66

-1

drivers/scsi/qla1280.c

reviewed

··· 4203 4203 .can_queue = MAX_OUTSTANDING_COMMANDS, 4204 4204 .this_id = -1, 4205 4205 .sg_tablesize = SG_ALL, 4206 4206 - .use_clustering = ENABLE_CLUSTERING, 4207 4206 }; 4208 4207 4209 4208

-1

drivers/scsi/qla2xxx/qla_os.c

reviewed

··· 328 328 .map_queues = qla2xxx_map_queues, 329 329 .this_id = -1, 330 330 .cmd_per_lun = 3, 331 331 - .use_clustering = ENABLE_CLUSTERING, 332 331 .sg_tablesize = SG_ALL, 333 332 334 333 .max_sectors = 0xFFFF,

-1

drivers/scsi/qla4xxx/ql4_os.c

reviewed

··· 205 205 206 206 .this_id = -1, 207 207 .cmd_per_lun = 3, 208 208 - .use_clustering = ENABLE_CLUSTERING, 209 208 .sg_tablesize = SG_ALL, 210 209 211 210 .max_sectors = 0xFFFF,

-1

drivers/scsi/qlogicpti.c

reviewed

··· 1287 1287 .can_queue = QLOGICPTI_REQ_QUEUE_LEN, 1288 1288 .this_id = 7, 1289 1289 .sg_tablesize = QLOGICPTI_MAX_SG(QLOGICPTI_REQ_QUEUE_LEN), 1290 1290 - .use_clustering = ENABLE_CLUSTERING, 1291 1290 }; 1292 1291 1293 1292 static const struct of_device_id qpti_match[];

+2 -3

drivers/scsi/scsi_debug.c

reviewed

··· 5851 5851 .sg_tablesize = SG_MAX_SEGMENTS, 5852 5852 .cmd_per_lun = DEF_CMD_PER_LUN, 5853 5853 .max_sectors = -1U, 5854 5854 - .use_clustering = DISABLE_CLUSTERING, 5855 5854 .module = THIS_MODULE, 5856 5855 .track_queue_depth = 1, 5857 5856 }; ··· 5865 5866 sdbg_host = to_sdebug_host(dev); 5866 5867 5867 5868 sdebug_driver_template.can_queue = sdebug_max_queue; 5868 5868 - if (sdebug_clustering) 5869 5869 - sdebug_driver_template.use_clustering = ENABLE_CLUSTERING; 5869 5869 + if (!sdebug_clustering) 5870 5870 + sdebug_driver_template.use_clustering = DISABLE_CLUSTERING; 5870 5871 hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host)); 5871 5872 if (NULL == hpnt) { 5872 5873 pr_err("scsi_host_alloc failed\n");

+1 -1

drivers/scsi/scsi_lib.c

reviewed

··· 2229 2229 2230 2230 blk_queue_max_segment_size(q, dma_get_max_seg_size(dev)); 2231 2231 2232 2232 - if (!shost->use_clustering) 2232 2232 + if (shost->use_clustering == DISABLE_CLUSTERING) 2233 2233 q->limits.cluster = 0; 2234 2234 2235 2235 /*

-1

drivers/scsi/smartpqi/smartpqi_init.c

reviewed

··· 5779 5779 .scan_start = pqi_scan_start, 5780 5780 .scan_finished = pqi_scan_finished, 5781 5781 .this_id = -1, 5782 5782 - .use_clustering = ENABLE_CLUSTERING, 5783 5782 .eh_device_reset_handler = pqi_eh_device_reset_handler, 5784 5783 .ioctl = pqi_ioctl, 5785 5784 .slave_alloc = pqi_slave_alloc,

-1

drivers/scsi/snic/snic_main.c

reviewed

··· 127 127 .this_id = -1, 128 128 .cmd_per_lun = SNIC_DFLT_QUEUE_DEPTH, 129 129 .can_queue = SNIC_MAX_IO_REQ, 130 130 - .use_clustering = ENABLE_CLUSTERING, 131 130 .sg_tablesize = SNIC_MAX_SG_DESC_CNT, 132 131 .max_sectors = 0x800, 133 132 .shost_attrs = snic_attrs,

-1

drivers/scsi/storvsc_drv.c

reviewed

··· 1698 1698 .slave_configure = storvsc_device_configure, 1699 1699 .cmd_per_lun = 2048, 1700 1700 .this_id = -1, 1701 1701 - .use_clustering = ENABLE_CLUSTERING, 1702 1701 /* Make sure we dont get a sg segment crosses a page boundary */ 1703 1702 .dma_boundary = PAGE_SIZE-1, 1704 1703 .no_write_same = 1,

-1

drivers/scsi/sym53c8xx_2/sym_glue.c

reviewed

··· 1660 1660 .eh_bus_reset_handler = sym53c8xx_eh_bus_reset_handler, 1661 1661 .eh_host_reset_handler = sym53c8xx_eh_host_reset_handler, 1662 1662 .this_id = 7, 1663 1663 - .use_clustering = ENABLE_CLUSTERING, 1664 1663 .max_sectors = 0xFFFF, 1665 1664 #ifdef SYM_LINUX_PROC_INFO_SUPPORT 1666 1665 .show_info = sym_show_info,

-1

drivers/scsi/virtio_scsi.c

reviewed

··· 697 697 .slave_alloc = virtscsi_device_alloc, 698 698 699 699 .dma_boundary = UINT_MAX, 700 700 - .use_clustering = ENABLE_CLUSTERING, 701 700 .map_queues = virtscsi_map_queues, 702 701 .track_queue_depth = 1, 703 702 .force_blk_mq = 1,

-1

drivers/scsi/vmw_pvscsi.c

reviewed

··· 1007 1007 .sg_tablesize = PVSCSI_MAX_NUM_SG_ENTRIES_PER_SEGMENT, 1008 1008 .dma_boundary = UINT_MAX, 1009 1009 .max_sectors = 0xffff, 1010 1010 - .use_clustering = ENABLE_CLUSTERING, 1011 1010 .change_queue_depth = pvscsi_change_queue_depth, 1012 1011 .eh_abort_handler = pvscsi_abort, 1013 1012 .eh_device_reset_handler = pvscsi_device_reset,

-1

drivers/scsi/wd719x.c

reviewed

··· 871 871 .can_queue = 255, 872 872 .this_id = 7, 873 873 .sg_tablesize = WD719X_SG, 874 874 - .use_clustering = ENABLE_CLUSTERING, 875 874 }; 876 875 877 876 static int wd719x_pci_probe(struct pci_dev *pdev, const struct pci_device_id *d)

-6

drivers/staging/rts5208/rtsx.c

reviewed

··· 237 237 /* limit the total size of a transfer to 120 KB */ 238 238 .max_sectors = 240, 239 239 240 240 - /* merge commands... this seems to help performance, but 241 241 - * periodically someone should test to see which setting is more 242 242 - * optimal. 243 243 - */ 244 244 - .use_clustering = 1, 245 245 - 246 240 /* emulated HBA */ 247 241 .emulated = 1, 248 242

-1

drivers/staging/unisys/visorhba/visorhba_main.c

reviewed

··· 645 645 .this_id = -1, 646 646 .slave_alloc = visorhba_slave_alloc, 647 647 .slave_destroy = visorhba_slave_destroy, 648 648 - .use_clustering = ENABLE_CLUSTERING, 649 648 }; 650 649 651 650 /*

-1

drivers/usb/image/microtek.c

reviewed

··· 632 632 .sg_tablesize = SG_ALL, 633 633 .can_queue = 1, 634 634 .this_id = -1, 635 635 - .use_clustering = 1, 636 635 .emulated = 1, 637 636 .slave_alloc = mts_slave_alloc, 638 637 .slave_configure = mts_slave_configure,

-7

drivers/usb/storage/scsiglue.c

reviewed

··· 639 639 */ 640 640 .max_sectors = 240, 641 641 642 642 - /* 643 643 - * merge commands... this seems to help performance, but 644 644 - * periodically someone should test to see which setting is more 645 645 - * optimal. 646 646 - */ 647 647 - .use_clustering = 1, 648 648 - 649 642 /* emulated HBA */ 650 643 .emulated = 1, 651 644

-2

include/linux/libata.h

reviewed

··· 135 135 136 136 ATA_SHT_EMULATED = 1, 137 137 ATA_SHT_THIS_ID = -1, 138 138 - ATA_SHT_USE_CLUSTERING = 1, 139 138 140 139 /* struct ata_taskfile flags */ 141 140 ATA_TFLAG_LBA48 = (1 << 0), /* enable 48-bit LBA and "HOB" */ ··· 1359 1360 .tag_alloc_policy = BLK_TAG_ALLOC_RR, \ 1360 1361 .this_id = ATA_SHT_THIS_ID, \ 1361 1362 .emulated = ATA_SHT_EMULATED, \ 1362 1362 - .use_clustering = ATA_SHT_USE_CLUSTERING, \ 1363 1363 .proc_name = drv_name, \ 1364 1364 .slave_configure = ata_scsi_slave_config, \ 1365 1365 .slave_destroy = ata_scsi_slave_destroy, \

+1 -2

include/scsi/scsi_host.h

reviewed

··· 44 44 #define MODE_INITIATOR 0x01 45 45 #define MODE_TARGET 0x02 46 46 47 47 - #define DISABLE_CLUSTERING 0 48 48 - #define ENABLE_CLUSTERING 1 47 47 + #define DISABLE_CLUSTERING (-1) 49 48 50 49 struct scsi_host_template { 51 50 struct module *module;