diff options
| author | Lukas Wunner <[email protected]> | 2015-09-23 17:55:15 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-09-25 12:44:54 -0700 |
| commit | 784a7fe5d9a0c02e96f3ae019a08ecebee2a7018 (patch) | |
| tree | 2a2c0491137685e4d89014930ca9cd2aac2a898c /module/zfs/zvol.c | |
| parent | 4a4809faab83be1bc723086ad44816bacf646ae3 (diff) | |
Linux 4.3 compat: bio_end_io_t / BIO_UPTODATE
Commit torvalds/linux@4246a0b63bd8f56a1469b12eafeb875b1041a451
("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 37f9dac592bf ("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 <[email protected]>
Signed-off-by: Lukas Wunner <[email protected]>
Issue #3799
Diffstat (limited to 'module/zfs/zvol.c')
| -rw-r--r-- | module/zfs/zvol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 37c39d19a..c81f02a39 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -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); |