From f0688df6b56d2413712f1cddd1fce60b53f52a8a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 1 May 2020 16:51:13 +0200 Subject: [PATCH] ANDROID: GKI: blk_types.h: add Android ABI padding to a structure Try to mitigate potential future driver core api changes by adding a padding to struct bio. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: Ib69c7bb8b553cacb9cb7bc020d8ac2bbc75621ba --- include/linux/blk_types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index e47f86a147a6..a42b751da268 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -9,6 +9,7 @@ #include #include #include +#include struct bio_set; struct bio; @@ -261,6 +262,9 @@ struct bio { struct bio_set *bi_pool; + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + /* * We can inline a number of vecs at the end of the bio, to avoid * double allocations for a small number of bio_vecs. This member