openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 2020-05-02 09:37:37 +02:00 committed by Carlos Llamas
parent 5988e691de
commit f25b001302
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/genhd.h
View File

@ -16,6 +16,7 @@
#include <linux/blk_types.h> #include <linux/blk_types.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/xarray.h> #include <linux/xarray.h>
#include <linux/android_kabi.h>
extern const struct device_type disk_type; extern const struct device_type disk_type;
extern struct device_type part_type; extern struct device_type part_type;
@ -112,6 +113,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 {
@ -162,6 +166,11 @@ struct gendisk {
struct badblocks *bb; struct badblocks *bb;
struct lockdep_map lockdep_map; struct lockdep_map lockdep_map;
u64 diskseq; u64 diskseq;
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)