Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[platform/kernel/linux-starfive.git] / drivers / block / rnbd / rnbd-clt.c

diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c
index 2f37868..b66e884 100644 (file)
--- a/drivers/block/rnbd/rnbd-clt.c
+++ b/drivers/block/rnbd/rnbd-clt.c
@@ -79,7 +79,6 @@ static int rnbd_clt_set_dev_attr(struct rnbd_clt_dev *dev,
        dev->nsectors               = le64_to_cpu(rsp->nsectors);
        dev->logical_block_size     = le16_to_cpu(rsp->logical_block_size);
        dev->physical_block_size    = le16_to_cpu(rsp->physical_block_size);
-       dev->max_write_same_sectors = le32_to_cpu(rsp->max_write_same_sectors);
        dev->max_discard_sectors    = le32_to_cpu(rsp->max_discard_sectors);
        dev->discard_granularity    = le32_to_cpu(rsp->discard_granularity);
        dev->discard_alignment      = le32_to_cpu(rsp->discard_alignment);
@@ -1355,8 +1354,6 @@ static void setup_request_queue(struct rnbd_clt_dev *dev)
        blk_queue_logical_block_size(dev->queue, dev->logical_block_size);
        blk_queue_physical_block_size(dev->queue, dev->physical_block_size);
        blk_queue_max_hw_sectors(dev->queue, dev->max_hw_sectors);
-       blk_queue_max_write_same_sectors(dev->queue,
-                                        dev->max_write_same_sectors);
 
        /*
         * we don't support discards to "discontiguous" segments
@@ -1606,10 +1603,10 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname,
        }
 
        rnbd_clt_info(dev,
-                      "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_write_same_sectors: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, wc: %d, fua: %d)\n",
+                      "map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, wc: %d, fua: %d)\n",
                       dev->gd->disk_name, dev->nsectors,
                       dev->logical_block_size, dev->physical_block_size,
-                      dev->max_write_same_sectors, dev->max_discard_sectors,
+                      dev->max_discard_sectors,
                       dev->discard_granularity, dev->discard_alignment,
                       dev->secure_discard, dev->max_segments,
                       dev->max_hw_sectors, dev->wc, dev->fua);