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 <gregkh@google.com>
Change-Id: I5d19bf942fbedc64f705f5d27ae629c57209df27
This commit is contained in:
Greg Kroah-Hartman
2023-05-30 19:28:04 +00:00
committed by Carlos Llamas
parent 0205308795
commit caf18df2e2

View File

@@ -118,6 +118,9 @@ struct blk_integrity {
unsigned char tuple_size; unsigned char tuple_size;
unsigned char interval_exp; unsigned char interval_exp;
unsigned char tag_size; unsigned char tag_size;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
}; };
struct gendisk { struct gendisk {
@@ -203,6 +206,11 @@ struct gendisk {
* devices that do not have multiple independent access ranges. * devices that do not have multiple independent access ranges.
*/ */
struct blk_independent_access_ranges *ia_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) static inline bool disk_live(struct gendisk *disk)