github/open-cas-linux
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1531 from mmichal10/fix-make-req-type

Browse Source 
configure framework: detect make_req_fn type
This commit is contained in:
Robert Baldyga
2024-10-02 10:33:27 +02:00
committed by GitHub
parent 1fd718fcb0 8fbbf31734
commit 7ce5b7e68f
2 changed files with 91 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/cas_cache/exp_obj.c
View File

@@ -31,27 +31,6 @@ static inline void bd_release_from_disk(struct block_device *bdev,
return bd_unlink_disk_holder(bdev, disk);
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
#define KRETURN(x) return
#define MAKE_RQ_RET_TYPE void
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
#define KRETURN(x) ({ return (x); })
#define MAKE_RQ_RET_TYPE blk_qc_t
#else
#define KRETURN(x) return
#define MAKE_RQ_RET_TYPE void
#endif
/* For RHEL 9.x we assume backport from kernel 5.18+ */
#ifdef RHEL_MAJOR
#if RHEL_MAJOR >= 9
#undef KRETURN
#undef MAKE_RQ_RET_TYPE
#define KRETURN(x) return
#define MAKE_RQ_RET_TYPE void
#endif
#endif
int __init cas_init_exp_objs(void)
{
CAS_DEBUG_TRACE();
@@ -82,7 +61,7 @@ void cas_deinit_exp_objs(void)
unregister_blkdev(cas_module.disk_major, "cas");
}
static MAKE_RQ_RET_TYPE _cas_exp_obj_submit_bio(struct bio *bio)
static CAS_MAKE_REQ_RET_TYPE _cas_exp_obj_submit_bio(struct bio *bio)
{
struct cas_disk *dsk;
struct cas_exp_obj *exp_obj;
@@ -93,15 +72,15 @@ static MAKE_RQ_RET_TYPE _cas_exp_obj_submit_bio(struct bio *bio)
exp_obj->ops->submit_bio(dsk, bio, exp_obj->private);
KRETURN(0);
CAS_KRETURN(0);
}
static MAKE_RQ_RET_TYPE _cas_exp_obj_make_rq_fn(struct request_queue *q,
static CAS_MAKE_REQ_RET_TYPE _cas_exp_obj_make_rq_fn(struct request_queue *q,
struct bio *bio)
{
_cas_exp_obj_submit_bio(bio);
cas_blk_queue_exit(q);
KRETURN(0);
CAS_KRETURN(0);
}
static int _cas_del_partitions(struct cas_disk *dsk)