Merge branch 'linus' into core/rodata

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / xpram.c

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index a04d9120cef0111970cb4980235781a0f76a8a2c..f231bc21b1cafd3465dcf97cc3c4f6618b5b804c 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -191,7 +191,7 @@ static unsigned long __init xpram_highest_page_index(void)
 /*
  * Block device make request function.
  */
-static int xpram_make_request(request_queue_t *q, struct bio *bio)
+static int xpram_make_request(struct request_queue *q, struct bio *bio)
 {
        xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data;
        struct bio_vec *bvec;
@@ -230,12 +230,10 @@ static int xpram_make_request(request_queue_t *q, struct bio *bio)
                }
        }
        set_bit(BIO_UPTODATE, &bio->bi_flags);
-       bytes = bio->bi_size;
-       bio->bi_size = 0;
-       bio->bi_end_io(bio, bytes, 0);
+       bio_endio(bio, 0);
        return 0;
 fail:
-       bio_io_error(bio, bio->bi_size);
+       bio_io_error(bio);
        return 0;
 }