From d817c17100183b266aa6bf8b868e016805d51d16 Mon Sep 17 00:00:00 2001 From: Coleman Kane Date: Sun, 9 Aug 2020 12:12:25 -0400 Subject: 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 Signed-off-by: Coleman Kane Closes #10696 --- include/os/linux/kernel/linux/blkdev_compat.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/os/linux') diff --git a/include/os/linux/kernel/linux/blkdev_compat.h b/include/os/linux/kernel/linux/blkdev_compat.h index b46a6e40a..1cdc300a6 100644 --- a/include/os/linux/kernel/linux/blkdev_compat.h +++ b/include/os/linux/kernel/linux/blkdev_compat.h @@ -487,6 +487,7 @@ blk_generic_end_io_acct(struct request_queue *q, int rw, #endif } +#ifndef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS static inline struct request_queue * blk_generic_alloc_queue(make_request_fn make_request, int node_id) { @@ -500,5 +501,6 @@ blk_generic_alloc_queue(make_request_fn make_request, int node_id) return (q); #endif } +#endif /* !HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ #endif /* _ZFS_BLKDEV_H */ -- cgit v1.2.3