From 1824980d29e9d976e88128400196cd93fbf7bc92 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 13 Nov 2025 12:20:23 -0800 Subject: [PATCH] Remove KC_BIO_BI_STATUS compat for el7 Unwrap the remaining stubs. Signed-off-by: Auke Kok --- kmod/src/Makefile.kernelcompat | 10 ---------- kmod/src/block.c | 8 ++++---- kmod/src/kernelcompat.h | 8 -------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index 15e5d7d1..34074a70 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -6,16 +6,6 @@ ccflags-y += -include $(src)/kernelcompat.h -# -# v4.12-rc2-201-g4e4cbee93d56 -# -# Moves to bi_status BLK_STS_ API instead of having a mix of error -# end_io args or bi_error. -# -ifneq (,$(shell grep 'bi_status' include/linux/blk_types.h)) -ccflags-y += -DKC_BIO_BI_STATUS -endif - # # v4.3-9290-ge409de992e3e # diff --git a/kmod/src/block.c b/kmod/src/block.c index 8d581da3..7d28758e 100644 --- a/kmod/src/block.c +++ b/kmod/src/block.c @@ -444,13 +444,13 @@ static void block_end_io(struct super_block *sb, blk_opf_t opf, wake_up(&binf->waitq); } -static void KC_DECLARE_BIO_END_IO(block_bio_end_io, struct bio *bio) +static void block_bio_end_io(struct bio *bio) { struct block_private *bp = bio->bi_private; struct super_block *sb = bp->sb; TRACE_BLOCK(end_io, bp); - block_end_io(sb, bio->bi_opf, bp, kc_bio_get_errno(bio)); + block_end_io(sb, bio->bi_opf, bp, blk_status_to_errno(bio->bi_status)); bio_put(bio); } @@ -1179,11 +1179,11 @@ struct sm_block_completion { int err; }; -static void KC_DECLARE_BIO_END_IO(sm_block_bio_end_io, struct bio *bio) +static void sm_block_bio_end_io(struct bio *bio) { struct sm_block_completion *sbc = bio->bi_private; - sbc->err = kc_bio_get_errno(bio); + sbc->err = blk_status_to_errno(bio->bi_status); complete(&sbc->comp); bio_put(bio); } diff --git a/kmod/src/kernelcompat.h b/kmod/src/kernelcompat.h index af36ea88..c12f27d8 100644 --- a/kmod/src/kernelcompat.h +++ b/kmod/src/kernelcompat.h @@ -14,14 +14,6 @@ #define WQ_NON_REENTRANT 0 #endif -#ifdef KC_BIO_BI_STATUS -#define KC_DECLARE_BIO_END_IO(name, bio) name(bio) -#define kc_bio_get_errno(bio) ({ blk_status_to_errno((bio)->bi_status); }) -#else -#define KC_DECLARE_BIO_END_IO(name, bio) name(bio, int _error_arg) -#define kc_bio_get_errno(bio) ({ (int)((void)(bio), _error_arg); }) -#endif - /* * v4.13-rc1-6-ge462ec50cb5f *