Merge tag 'for-linus-20190726-2' of git://git.kernel.dk/linux-block

5168afe6 · Linus Torvalds <[email protected]> · 2019-07-26 19:20:34 -07:00

Pull block DMA segment fix from Jens Axboe:
 "Here's the virtual boundary segment size fix"

* tag 'for-linus-20190726-2' of git://git.kernel.dk/linux-block:
  block: fix max segment size handling in blk_queue_virt_boundary

Commit: 5168afe6ef596eaf2ff7a533b780c79ce14445e4
Parents: 40233e7c · c6c84f78

Merge commit. Changes below are compared with the first parent: 40233e7c.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
block/blk-settings.c	modified	+2	−1	View file

block/blk-settings.c

View file

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 2ae348c..2c18312 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -752,7 +752,8 @@ void blk_queue_virt_boundary(struct request_queue *q, unsigned long mask)
 	 * page (which might not be idential to the Linux PAGE_SIZE).  Because
 	 * of that they are not limited by our notion of "segment size".
 	 */
-	q->limits.max_segment_size = UINT_MAX;
+	if (mask)
+		q->limits.max_segment_size = UINT_MAX;
 }
 EXPORT_SYMBOL(blk_queue_virt_boundary);
 