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

scsi: Do not set cmd_per_lun to 1 in the host template

'0' is now used as the default cmd_per_lun value,
so there's no need to explicitly set it to '1' in the
host template.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

authored by

Hannes Reinecke and committed by
James Bottomley
b84b1d52 f532a3f9

-42
-1
drivers/block/cciss_scsi.c
··· 84 84 .show_info = cciss_scsi_show_info, 85 85 .queuecommand = cciss_scsi_queue_command, 86 86 .this_id = 7, 87 - .cmd_per_lun = 1, 88 87 .use_clustering = DISABLE_CLUSTERING, 89 88 /* Can't have eh_bus_reset_handler or eh_host_reset_handler for cciss */ 90 89 .eh_device_reset_handler= cciss_eh_device_reset_handler,
-1
drivers/firewire/sbp2.c
··· 1611 1611 .this_id = -1, 1612 1612 .sg_tablesize = SG_ALL, 1613 1613 .use_clustering = ENABLE_CLUSTERING, 1614 - .cmd_per_lun = 1, 1615 1614 .can_queue = 1, 1616 1615 .sdev_attrs = sbp2_scsi_sysfs_attrs, 1617 1616 };
-1
drivers/s390/scsi/zfcp_scsi.c
··· 297 297 * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8, 298 298 /* GCD, adjusted later */ 299 299 .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, 300 - .cmd_per_lun = 1, 301 300 .use_clustering = 1, 302 301 .shost_attrs = zfcp_sysfs_shost_attrs, 303 302 .sdev_attrs = zfcp_sysfs_sdev_attrs,
-1
drivers/scsi/NCR53c406a.c
··· 1064 1064 .can_queue = 1 /* can_queue */, 1065 1065 .this_id = 7 /* SCSI ID of the chip */, 1066 1066 .sg_tablesize = 32 /*SG_ALL*/ /*SG_NONE*/, 1067 - .cmd_per_lun = 1 /* commands per lun */, 1068 1067 .unchecked_isa_dma = 1 /* unchecked_isa_dma */, 1069 1068 .use_clustering = ENABLE_CLUSTERING, 1070 1069 };
-1
drivers/scsi/a100u2w.c
··· 1078 1078 .can_queue = 1, 1079 1079 .this_id = 1, 1080 1080 .sg_tablesize = SG_ALL, 1081 - .cmd_per_lun = 1, 1082 1081 .use_clustering = ENABLE_CLUSTERING, 1083 1082 }; 1084 1083
-1
drivers/scsi/aha152x.c
··· 2922 2922 .can_queue = 1, 2923 2923 .this_id = 7, 2924 2924 .sg_tablesize = SG_ALL, 2925 - .cmd_per_lun = 1, 2926 2925 .use_clustering = DISABLE_CLUSTERING, 2927 2926 .slave_alloc = aha152x_adjust_queue, 2928 2927 };
-1
drivers/scsi/aha1542.c
··· 950 950 .can_queue = AHA1542_MAILBOXES, 951 951 .this_id = 7, 952 952 .sg_tablesize = 16, 953 - .cmd_per_lun = 1, 954 953 .unchecked_isa_dma = 1, 955 954 .use_clustering = ENABLE_CLUSTERING, 956 955 };
-1
drivers/scsi/aha1740.c
··· 544 544 .can_queue = AHA1740_ECBS, 545 545 .this_id = 7, 546 546 .sg_tablesize = AHA1740_SCATTER, 547 - .cmd_per_lun = AHA1740_CMDLUN, 548 547 .use_clustering = ENABLE_CLUSTERING, 549 548 .eh_abort_handler = aha1740_eh_abort_handler, 550 549 };
-1
drivers/scsi/aha1740.h
··· 149 149 150 150 #define AHA1740_ECBS 32 151 151 #define AHA1740_SCATTER 16 152 - #define AHA1740_CMDLUN 1 153 152 154 153 #endif
-1
drivers/scsi/aic94xx/aic94xx_init.c
··· 65 65 .change_queue_depth = sas_change_queue_depth, 66 66 .bios_param = sas_bios_param, 67 67 .can_queue = 1, 68 - .cmd_per_lun = 1, 69 68 .this_id = -1, 70 69 .sg_tablesize = SG_ALL, 71 70 .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
-1
drivers/scsi/arm/arxescsi.c
··· 245 245 .can_queue = 0, 246 246 .this_id = 7, 247 247 .sg_tablesize = SG_ALL, 248 - .cmd_per_lun = 1, 249 248 .use_clustering = DISABLE_CLUSTERING, 250 249 .proc_name = "arxescsi", 251 250 };
-1
drivers/scsi/arm/cumana_2.c
··· 367 367 .this_id = 7, 368 368 .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, 369 369 .dma_boundary = IOMD_DMA_BOUNDARY, 370 - .cmd_per_lun = 1, 371 370 .use_clustering = DISABLE_CLUSTERING, 372 371 .proc_name = "cumanascsi2", 373 372 };
-1
drivers/scsi/arm/eesox.c
··· 486 486 .this_id = 7, 487 487 .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, 488 488 .dma_boundary = IOMD_DMA_BOUNDARY, 489 - .cmd_per_lun = 1, 490 489 .use_clustering = DISABLE_CLUSTERING, 491 490 .proc_name = "eesox", 492 491 };
-1
drivers/scsi/atp870u.c
··· 3158 3158 .can_queue = qcnt /* can_queue */, 3159 3159 .this_id = 7 /* SCSI ID */, 3160 3160 .sg_tablesize = ATP870U_SCATTER /*SG_ALL*/ /*SG_NONE*/, 3161 - .cmd_per_lun = ATP870U_CMDLUN /* commands per lun */, 3162 3161 .use_clustering = ENABLE_CLUSTERING, 3163 3162 .max_sectors = ATP870U_MAX_SECTORS, 3164 3163 };
-1
drivers/scsi/atp870u.h
··· 10 10 #define MAX_SENSE 14 11 11 #define qcnt 32 12 12 #define ATP870U_SCATTER 128 13 - #define ATP870U_CMDLUN 1 14 13 15 14 #define MAX_ADAPTER 8 16 15 #define MAX_SCSI_ID 16
-1
drivers/scsi/dpt_i2o.c
··· 3562 3562 .slave_configure = adpt_slave_configure, 3563 3563 .can_queue = MAX_TO_IOP_MESSAGES, 3564 3564 .this_id = 7, 3565 - .cmd_per_lun = 1, 3566 3565 .use_clustering = ENABLE_CLUSTERING, 3567 3566 }; 3568 3567
-1
drivers/scsi/fdomain.c
··· 1764 1764 .can_queue = 1, 1765 1765 .this_id = 6, 1766 1766 .sg_tablesize = 64, 1767 - .cmd_per_lun = 1, 1768 1767 .use_clustering = DISABLE_CLUSTERING, 1769 1768 }; 1770 1769
-1
drivers/scsi/imm.c
··· 1109 1109 .bios_param = imm_biosparam, 1110 1110 .this_id = 7, 1111 1111 .sg_tablesize = SG_ALL, 1112 - .cmd_per_lun = 1, 1113 1112 .use_clustering = ENABLE_CLUSTERING, 1114 1113 .can_queue = 1, 1115 1114 .slave_alloc = imm_adjust_queue,
-1
drivers/scsi/initio.c
··· 2833 2833 .can_queue = MAX_TARGETS * i91u_MAXQUEUE, 2834 2834 .this_id = 1, 2835 2835 .sg_tablesize = SG_ALL, 2836 - .cmd_per_lun = 1, 2837 2836 .use_clustering = ENABLE_CLUSTERING, 2838 2837 }; 2839 2838
-1
drivers/scsi/isci/init.c
··· 160 160 .change_queue_depth = sas_change_queue_depth, 161 161 .bios_param = sas_bios_param, 162 162 .can_queue = ISCI_CAN_QUEUE_VAL, 163 - .cmd_per_lun = 1, 164 163 .this_id = -1, 165 164 .sg_tablesize = SG_ALL, 166 165 .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
-1
drivers/scsi/mac53c94.c
··· 403 403 .can_queue = 1, 404 404 .this_id = 7, 405 405 .sg_tablesize = SG_ALL, 406 - .cmd_per_lun = 1, 407 406 .use_clustering = DISABLE_CLUSTERING, 408 407 }; 409 408
-1
drivers/scsi/mvsas/mv_init.c
··· 56 56 .change_queue_depth = sas_change_queue_depth, 57 57 .bios_param = sas_bios_param, 58 58 .can_queue = 1, 59 - .cmd_per_lun = 1, 60 59 .this_id = -1, 61 60 .sg_tablesize = SG_ALL, 62 61 .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
-1
drivers/scsi/nsp32.c
··· 274 274 .can_queue = 1, 275 275 .sg_tablesize = NSP32_SG_SIZE, 276 276 .max_sectors = 128, 277 - .cmd_per_lun = 1, 278 277 .this_id = NSP32_HOST_SCSIID, 279 278 .use_clustering = DISABLE_CLUSTERING, 280 279 .eh_abort_handler = nsp32_eh_abort,
-1
drivers/scsi/pcmcia/nsp_cs.c
··· 86 86 .can_queue = 1, 87 87 .this_id = NSP_INITIATOR_ID, 88 88 .sg_tablesize = SG_ALL, 89 - .cmd_per_lun = 1, 90 89 .use_clustering = DISABLE_CLUSTERING, 91 90 }; 92 91
-1
drivers/scsi/pcmcia/qlogic_stub.c
··· 72 72 .can_queue = 1, 73 73 .this_id = -1, 74 74 .sg_tablesize = SG_ALL, 75 - .cmd_per_lun = 1, 76 75 .use_clustering = DISABLE_CLUSTERING, 77 76 }; 78 77
-1
drivers/scsi/pcmcia/sym53c500_cs.c
··· 680 680 .can_queue = 1, 681 681 .this_id = 7, 682 682 .sg_tablesize = 32, 683 - .cmd_per_lun = 1, 684 683 .use_clustering = ENABLE_CLUSTERING, 685 684 .shost_attrs = SYM53C500_shost_attrs 686 685 };
-1
drivers/scsi/pm8001/pm8001_init.c
··· 78 78 .change_queue_depth = sas_change_queue_depth, 79 79 .bios_param = sas_bios_param, 80 80 .can_queue = 1, 81 - .cmd_per_lun = 1, 82 81 .this_id = -1, 83 82 .sg_tablesize = SG_ALL, 84 83 .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
-1
drivers/scsi/ppa.c
··· 974 974 .bios_param = ppa_biosparam, 975 975 .this_id = -1, 976 976 .sg_tablesize = SG_ALL, 977 - .cmd_per_lun = 1, 978 977 .use_clustering = ENABLE_CLUSTERING, 979 978 .can_queue = 1, 980 979 .slave_alloc = ppa_adjust_queue,
-1
drivers/scsi/ps3rom.c
··· 347 347 .can_queue = 1, 348 348 .this_id = 7, 349 349 .sg_tablesize = SG_ALL, 350 - .cmd_per_lun = 1, 351 350 .emulated = 1, /* only sg driver uses this */ 352 351 .max_sectors = PS3ROM_MAX_SECTORS, 353 352 .use_clustering = ENABLE_CLUSTERING,
-1
drivers/scsi/qla1280.c
··· 4217 4217 .can_queue = 0xfffff, 4218 4218 .this_id = -1, 4219 4219 .sg_tablesize = SG_ALL, 4220 - .cmd_per_lun = 1, 4221 4220 .use_clustering = ENABLE_CLUSTERING, 4222 4221 }; 4223 4222
-1
drivers/scsi/qlogicfas.c
··· 193 193 .can_queue = 1, 194 194 .this_id = -1, 195 195 .sg_tablesize = SG_ALL, 196 - .cmd_per_lun = 1, 197 196 .use_clustering = DISABLE_CLUSTERING, 198 197 }; 199 198
-1
drivers/scsi/qlogicpti.c
··· 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 - .cmd_per_lun = 1, 1291 1290 .use_clustering = ENABLE_CLUSTERING, 1292 1291 }; 1293 1292
-1
drivers/scsi/sym53c416.c
··· 838 838 .can_queue = 1, 839 839 .this_id = SYM53C416_SCSI_ID, 840 840 .sg_tablesize = 32, 841 - .cmd_per_lun = 1, 842 841 .unchecked_isa_dma = 1, 843 842 .use_clustering = ENABLE_CLUSTERING, 844 843 };
-1
drivers/scsi/wd719x.c
··· 882 882 .can_queue = 255, 883 883 .this_id = 7, 884 884 .sg_tablesize = WD719X_SG, 885 - .cmd_per_lun = WD719X_CMD_PER_LUN, 886 885 .use_clustering = ENABLE_CLUSTERING, 887 886 }; 888 887
-2
drivers/scsi/wd719x.h
··· 2 2 #define _WD719X_H_ 3 3 4 4 #define WD719X_SG 255 /* Scatter/gather size */ 5 - #define WD719X_CMD_PER_LUN 1 /* We should be able to do linked commands, but 6 - * this is 1 for now to be safe. */ 7 5 8 6 struct wd719x_sglist { 9 7 __le32 ptr;
-1
drivers/staging/rts5208/rtsx.c
··· 230 230 231 231 /* queue commands only, only one command per LUN */ 232 232 .can_queue = 1, 233 - .cmd_per_lun = 1, 234 233 235 234 /* unknown initiator id */ 236 235 .this_id = -1,
-1
drivers/usb/image/microtek.c
··· 635 635 .sg_tablesize = SG_ALL, 636 636 .can_queue = 1, 637 637 .this_id = -1, 638 - .cmd_per_lun = 1, 639 638 .use_clustering = 1, 640 639 .emulated = 1, 641 640 .slave_alloc = mts_slave_alloc,
-1
drivers/usb/storage/scsiglue.c
··· 558 558 559 559 /* queue commands only, only one command per LUN */ 560 560 .can_queue = 1, 561 - .cmd_per_lun = 1, 562 561 563 562 /* unknown initiator id */ 564 563 .this_id = -1,
-1
drivers/usb/storage/uas.c
··· 803 803 .can_queue = 65536, /* Is there a limit on the _host_ ? */ 804 804 .this_id = -1, 805 805 .sg_tablesize = SG_NONE, 806 - .cmd_per_lun = 1, /* until we override it */ 807 806 .skip_settle_delay = 1, 808 807 .use_blk_tags = 1, 809 808 };
-2
include/linux/libata.h
··· 134 134 ATA_ALL_DEVICES = (1 << ATA_MAX_DEVICES) - 1, 135 135 136 136 ATA_SHT_EMULATED = 1, 137 - ATA_SHT_CMD_PER_LUN = 1, 138 137 ATA_SHT_THIS_ID = -1, 139 138 ATA_SHT_USE_CLUSTERING = 1, 140 139 ··· 1353 1354 .can_queue = ATA_DEF_QUEUE, \ 1354 1355 .tag_alloc_policy = BLK_TAG_ALLOC_RR, \ 1355 1356 .this_id = ATA_SHT_THIS_ID, \ 1356 - .cmd_per_lun = ATA_SHT_CMD_PER_LUN, \ 1357 1357 .emulated = ATA_SHT_EMULATED, \ 1358 1358 .use_clustering = ATA_SHT_USE_CLUSTERING, \ 1359 1359 .proc_name = drv_name, \