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 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 60bcc6df97a9..53ba417bef8a 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5851,7 +5851,6 @@ static struct scsi_host_template sdebug_driver_template = {
         .sg_tablesize =         SG_MAX_SEGMENTS,
         .cmd_per_lun =          DEF_CMD_PER_LUN,
         .max_sectors =          -1U,
-        .use_clustering =       DISABLE_CLUSTERING,
         .module =               THIS_MODULE,
         .track_queue_depth =    1,
 };
@@ -5866,8 +5865,8 @@ static int sdebug_driver_probe(struct device *dev)
         sdbg_host = to_sdebug_host(dev);
 
         sdebug_driver_template.can_queue = sdebug_max_queue;
-        if (sdebug_clustering)
-                sdebug_driver_template.use_clustering = ENABLE_CLUSTERING;
+        if (!sdebug_clustering)
+                sdebug_driver_template.use_clustering = DISABLE_CLUSTERING;
         hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
         if (NULL == hpnt) {
                 pr_err("scsi_host_alloc failed\n");