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

Merge pull request #1476 from robertbaldyga/fix-compilation-on-older-rhel

Browse Source 
Fix compilation on RHEL <9.x
This commit is contained in:
Robert Baldyga 2024-07-12 11:54:35 +02:00 committed by GitHub
commit eb97598e48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/cas_cache/exp_obj.c
View File

@ -31,12 +31,6 @@ static inline void bd_release_from_disk(struct block_device *bdev,
return bd_unlink_disk_holder(bdev, disk); 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) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
#define KRETURN(x) return #define KRETURN(x) return
#define MAKE_RQ_RET_TYPE void #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 KRETURN(x) ({ return (x); })
#define MAKE_RQ_RET_TYPE int #define MAKE_RQ_RET_TYPE int
#endif #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 #endif
int __init cas_init_exp_objs(void) int __init cas_init_exp_objs(void)