Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[cascardo/linux.git] / drivers / nvdimm / btt.c

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 028d2d1..2542397 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1167,7 +1167,7 @@ static void btt_make_request(struct request_queue *q, struct bio *bio)
         * another kernel subsystem, and we just pass it through.
         */
        if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) {
-               err = -EIO;
+               bio->bi_error = -EIO;
                goto out;
        }
 
@@ -1189,6 +1189,7 @@ static void btt_make_request(struct request_queue *q, struct bio *bio)
                                        "io error in %s sector %lld, len %d,\n",
                                        (rw == READ) ? "READ" : "WRITE",
                                        (unsigned long long) iter.bi_sector, len);
+                       bio->bi_error = err;
                        break;
                }
        }
@@ -1196,7 +1197,7 @@ static void btt_make_request(struct request_queue *q, struct bio *bio)
                nd_iostat_end(bio, start);
 
 out:
-       bio_endio(bio, err);
+       bio_endio(bio);
 }
 
 static int btt_rw_page(struct block_device *bdev, sector_t sector,