jsflash: handle highmem pages
authorChristoph Hellwig <hch@lst.de>
Wed, 9 May 2018 13:59:47 +0000 (15:59 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 11 May 2018 21:08:01 +0000 (15:08 -0600)
Just kmap the bio single page payload before processing it.

(and yes, now highmem on sparc32 anyway, but kmap_(un)map atomic are nops,
so this gives the right example)

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/sbus/char/jsflash.c

index 14f377ac12803bb2bd2eec847faca3ad2bde0fac..8520587b8d090a653dcf09a9d161dc6e0f1420a4 100644 (file)
@@ -215,6 +215,7 @@ static void jsfd_request(void)
                unsigned long offset = blk_rq_pos(req) << 9;
                size_t len = blk_rq_cur_bytes(req);
                blk_status_t err = BLK_STS_IOERR;
+               void *p;
 
                if ((offset + len) > jdp->dsize)
                        goto end;
@@ -229,7 +230,9 @@ static void jsfd_request(void)
                        goto end;
                }
 
-               jsfd_read(bio_data(req->bio), jdp->dbase + offset, len);
+               p = kmap_atomic(bio_page(bio)) + bio_offset(bio);
+               jsfd_read(p, jdp->dbase + offset, len);
+               kunmap_atomic(p);
                err = BLK_STS_OK;
        end:
                if (!__blk_end_request_cur(req, err))
@@ -592,7 +595,6 @@ static int jsfd_init(void)
                        put_disk(disk);
                        goto out;
                }
-               blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
                jsfd_disk[i] = disk;
        }