Linux 4.3 compat: bio_end_io_t / BIO_UPTODATE

Commit torvalds/linux@4246a0b63b
("block: add a bi_error field to struct bio") dropped the error
argument from bio_endio in favor of newly introduced bio->bi_error.
This also replaces bio->bi_flags value BIO_UPTODATE.

bio_endio was a 3 argument function until Linux 2.6.24, which made it
a 2 argument function, and now the prototype has changed yet again to
a 1 argument function. Support for pre 2.6.24 kernels was already
dropped with 37f9dac592 ("zvol processing should use struct bio")
which assumed the 2 argument version in zvol_request(). Remaining code
to support the 3 argument version is hereby removed.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Issue #3799
This commit is contained in:
Lukas Wunner
2015-09-23 17:55:15 +02:00
committed by Brian Behlendorf
parent 4a4809faab
commit 784a7fe5d9
4 changed files with 34 additions and 40 deletions
+1 -1
View File
@@ -752,7 +752,7 @@ zvol_request(struct request_queue *q, struct bio *bio)
out2:
generic_end_io_acct(rw, &zv->zv_disk->part0, start);
out1:
bio_endio(bio, -error);
BIO_END_IO(bio, -error);
spl_fstrans_unmark(cookie);
#ifdef HAVE_MAKE_REQUEST_FN_RET_INT
return (0);