diff options
| author | Coleman Kane <[email protected]> | 2020-08-09 12:12:25 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-08-11 13:37:33 -0700 |
| commit | d817c17100183b266aa6bf8b868e016805d51d16 (patch) | |
| tree | c6a0d14c441b00f12f6081b44f0d675fd61d45a1 /module | |
| parent | dcdc12e8babb2490249cd93ec77863b216c25c5d (diff) | |
Linux 5.9 compat: make_request_fn replaced with submit_bio interface
The make_request_fn and associated API was replaced recently in a
Linux 5.9 merge, to replace its functionality with a new submit_bio
member in struct block_device_operations.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #10696
Diffstat (limited to 'module')
| -rw-r--r-- | module/os/linux/zfs/zvol_os.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c index d1ce86c89..218e1101e 100644 --- a/module/os/linux/zfs/zvol_os.c +++ b/module/os/linux/zfs/zvol_os.c @@ -295,9 +295,17 @@ zvol_read(void *arg) kmem_free(zvr, sizeof (zv_request_t)); } +#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS +static blk_qc_t +zvol_submit_bio(struct bio *bio) +#else static MAKE_REQUEST_FN_RET zvol_request(struct request_queue *q, struct bio *bio) +#endif { +#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS + struct request_queue *q = bio->bi_disk->queue; +#endif zvol_state_t *zv = q->queuedata; fstrans_cookie_t cookie = spl_fstrans_mark(); uint64_t offset = BIO_BI_SECTOR(bio) << 9; @@ -425,7 +433,8 @@ zvol_request(struct request_queue *q, struct bio *bio) out: spl_fstrans_unmark(cookie); -#if defined(HAVE_MAKE_REQUEST_FN_RET_QC) +#if defined(HAVE_MAKE_REQUEST_FN_RET_QC) || \ + defined(HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS) return (BLK_QC_T_NONE); #endif } @@ -737,6 +746,9 @@ static struct block_device_operations zvol_ops = { .revalidate_disk = zvol_revalidate_disk, .getgeo = zvol_getgeo, .owner = THIS_MODULE, +#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS + .submit_bio = zvol_submit_bio, +#endif }; /* @@ -766,7 +778,11 @@ zvol_alloc(dev_t dev, const char *name) list_link_init(&zv->zv_next); mutex_init(&zv->zv_state_lock, NULL, MUTEX_DEFAULT, NULL); +#ifdef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS + zso->zvo_queue = blk_alloc_queue(NUMA_NO_NODE); +#else zso->zvo_queue = blk_generic_alloc_queue(zvol_request, NUMA_NO_NODE); +#endif if (zso->zvo_queue == NULL) goto out_kmem; |