NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: GKI: genhd.h: add Android ABI padding to some structures

Browse source 
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
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/linux/blkdev.h
View file

@ -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)