From b9081a2925c87934583cfb29d31ae40ad92d1723 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Apr 2020 15:42:10 +0200 Subject: [PATCH] ANDROID: GKI: bio: add Android ABI padding to some structures Try to mitigate potential future driver core api changes by adding a padding to struct bio_integrity_payload and struct bio_set. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I0397ede2e11560ad9422cd7765434fcd4f7a6dd8 --- include/linux/bio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/bio.h b/include/linux/bio.h index c6d765382926..5d6593db3b62 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -10,6 +10,7 @@ #include /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ #include +#include #define BIO_DEBUG @@ -325,6 +326,10 @@ struct bio_integrity_payload { struct work_struct bip_work; /* I/O completion */ struct bio_vec *bip_vec; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + struct bio_vec bip_inline_vecs[];/* embedded bvec array */ }; @@ -698,6 +703,11 @@ struct bio_set { struct bio_list rescue_list; struct work_struct rescue_work; struct workqueue_struct *rescue_workqueue; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; struct biovec_slab {