From 2063217053a6ea009c8abbc0a699c9ee29bdb916 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 Jul 2009 21:47:45 -0600
Subject: [PATCH] --- yaml --- r: 155519 b: refs/heads/master c:
 4eff3cae9c9809720c636e64bc72f212258e0bd5 h: refs/heads/master i:   155517:
 b548d7bde80b3d1634ad8d17593ddb9e4f25e469   155515:
 e16ec0801787dbd9c5b4587c8937715e2176f9d6   155511:
 83b103d507ca2bade06a63a9e52a3d703cf5a330   155503:
 c3947f4a4be8c14191fe8d79e1ab30abcf23a8b7   155487:
 b9028eb88b1b2d3436b6195e9137faa9309bc8df   155455:
 bc77a83ad1728efec6bc18f34c6c4ab8a787d58d   155391:
 cfbf84f1434088c75b95710cffc851603d0d1eb6 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/virtio_blk.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7e8c303db11..22b5318a9dea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a5049205f7265620c48781814155f2763e70abb
+refs/heads/master: 4eff3cae9c9809720c636e64bc72f212258e0bd5
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
index 43db3ea15b54..4c47859ad8b1 100644
--- a/trunk/drivers/block/virtio_blk.c
+++ b/trunk/drivers/block/virtio_blk.c
@@ -360,6 +360,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
 	blk_queue_max_phys_segments(vblk->disk->queue, vblk->sg_elems-2);
 	blk_queue_max_hw_segments(vblk->disk->queue, vblk->sg_elems-2);
 
+	/* No need to bounce any requests */
+	blk_queue_bounce_limit(vblk->disk->queue, BLK_BOUNCE_ANY);
+
 	/* No real sector limit. */
 	blk_queue_max_sectors(vblk->disk->queue, -1U);