Merge pull request #1476 from robertbaldyga/fix-compilation-on-older-rhel
Fix compilation on RHEL <9.x
This commit is contained in:
commit
eb97598e48
@ -31,12 +31,6 @@ static inline void bd_release_from_disk(struct block_device *bdev,
|
||||
return bd_unlink_disk_holder(bdev, disk);
|
||||
}
|
||||
|
||||
#ifdef RHEL_MAJOR
|
||||
#if RHEL_MAJOR >= 9
|
||||
#define KRETURN(x) return
|
||||
#define MAKE_RQ_RET_TYPE void
|
||||
#endif
|
||||
#else
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
|
||||
#define KRETURN(x) return
|
||||
#define MAKE_RQ_RET_TYPE void
|
||||
@ -50,6 +44,13 @@ static inline void bd_release_from_disk(struct block_device *bdev,
|
||||
#define KRETURN(x) ({ return (x); })
|
||||
#define MAKE_RQ_RET_TYPE int
|
||||
#endif
|
||||
|
||||
/* For RHEL 9.x we assume backport from kernel 5.18+ */
|
||||
#ifdef RHEL_MAJOR
|
||||
#if RHEL_MAJOR >= 9
|
||||
#define KRETURN(x) return
|
||||
#define MAKE_RQ_RET_TYPE void
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int __init cas_init_exp_objs(void)
|
||||
|
Loading…
Reference in New Issue
Block a user