Merge branch 'for-4.3/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / staging / lustre / lustre / llite / lloop.c

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index 06f5e51ecd9e1a8141c275232278dd6f081ef68a..5f0d80cc97183e2104c1fcbcd71610750bc08626 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -340,6 +340,8 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio)
        int rw = bio_rw(old_bio);
        int inactive;
 
+       blk_queue_split(q, &old_bio, q->bio_split);
+
        if (!lo)
                goto err;
 
@@ -376,7 +378,8 @@ static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio)
        while (bio) {
                struct bio *tmp = bio->bi_next;
                bio->bi_next = NULL;
-               bio_endio(bio, ret);
+               bio->bi_error = ret;
+               bio_endio(bio);
                bio = tmp;
        }
 }