From 0bf6595ec81d896451f0066c95f8cd34c74313dc Mon Sep 17 00:00:00 2001

From: Christoph Hellwig <hch@lst.de>

Date: Mon, 19 Jun 2017 09:26:25 +0200

Subject: [PATCH] block: don't set bounce limit in blk_init_allocated_queue

Git-commit: 0bf6595ec81d896451f0066c95f8cd34c74313dc

Patch-mainline: v4.13-rc1

References: fate#322738,fate#322919,fate#322950,fate#323773

And just move it into scsi_transport_sas which needs it due to low-level

drivers directly derferencing bio_data, and into blk_init_queue_node,

which will need a further push into the callers.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Coly Li <colyli@suse.de>

---

 block/blk-core.c                  | 10 +++++-----

 drivers/scsi/scsi_transport_sas.c |  5 +++++

 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c

index 8699c423fa6e..33b27541dc17 100644

--- a/block/blk-core.c

+++ b/block/blk-core.c

@@ -960,6 +960,11 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)

 		return NULL;

 	}

+	/*

+	 * by default assume old behaviour and bounce for any highmem page

+	 */

+	blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);

+

 	return q;

 }

 EXPORT_SYMBOL(blk_init_queue_node);

@@ -989,11 +994,6 @@ int blk_init_allocated_queue(struct request_queue *q)

 	 */

 	blk_queue_make_request(q, blk_queue_bio);

-	/*

-	 * by default assume old behaviour and bounce for any highmem page

-	 */

-	blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);

-

 	q->sg_reserved_size = INT_MAX;

 	/* Protect q->elevator from elevator_change */

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c

index a190c052cd93..5006a656e16a 100644

--- a/drivers/scsi/scsi_transport_sas.c

+++ b/drivers/scsi/scsi_transport_sas.c

@@ -251,6 +251,11 @@ static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)

 	if (error)

 		goto out_cleanup_queue;

+	/*

+	 * by default assume old behaviour and bounce for any highmem page

+	 */

+	blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);

+

 	error = bsg_register_queue(q, dev, name, release);

 	if (error)

 		goto out_cleanup_queue;

-- 

2.13.1