From caf18df2e2234ac4c6ea43e2d1b99297711c3da6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 30 May 2023 19:28:04 +0000 Subject: [PATCH] ANDROID: GKI: genhd.h: add Android ABI padding to some structures Try to mitigate potential future driver core api changes by adding a padding to struct blk_integrity, and struct gendisk. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I5d19bf942fbedc64f705f5d27ae629c57209df27 --- include/linux/blkdev.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5d4dd1db776d..1088bc1e38dd 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -118,6 +118,9 @@ struct blk_integrity { unsigned char tuple_size; unsigned char interval_exp; unsigned char tag_size; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; struct gendisk { @@ -203,6 +206,11 @@ struct gendisk { * devices that do not have multiple independent access ranges. */ struct blk_independent_access_ranges *ia_ranges; + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; static inline bool disk_live(struct gendisk *disk)