aoe: handle highmem pages

Use kmap_atomic when copying out of a bio_vec.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 6797e6c23c8a553e86a597277b0e2769e1fc0bcc..027b876370bc9a04b5601b78f644fd947e6c87c5 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -388,7 +388,6 @@ aoeblk_gdalloc(void *vp)
                        d->aoemajor, d->aoeminor);
                goto err_mempool;
        }
-       blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);
 
        spin_lock_irqsave(&d->lock, flags);
        WARN_ON(!(d->flags & DEVFL_GD_NOW));

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 540bb60cd071b65e9223bdccbe63ba057c7ac00d..096882e54095b4eccc76a88d3268517acfefd244 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1032,8 +1032,9 @@ bvcpy(struct sk_buff *skb, struct bio *bio, struct bvec_iter iter, long cnt)
        iter.bi_size = cnt;
 
        __bio_for_each_segment(bv, bio, iter, iter) {
-               char *p = page_address(bv.bv_page) + bv.bv_offset;
+               char *p = kmap_atomic(bv.bv_page) + bv.bv_offset;
                skb_copy_bits(skb, soff, p, bv.bv_len);
+               kunmap_atomic(p);
                soff += bv.bv_len;
        }
 }