moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: GKI: bio: add Android ABI padding to some structures

Browse Source 
Try to mitigate potential future driver core api changes by adding a
padding to struct bio_integrity_payload and struct bio_set.

Based on a change made to the RHEL/CENTOS 8 kernel.

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0397ede2e11560ad9422cd7765434fcd4f7a6dd8
This commit is contained in:
Greg Kroah-Hartman
2020-04-22 15:42:10 +02:00
committed by Todd Kjos
parent 976bb0ed77
commit 23c54dcf77
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/bio.h
View File

@@ -10,6 +10,7 @@
/* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */
#include <linux/blk_types.h> #include <linux/blk_types.h>
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/android_kabi.h>
#define BIO_DEBUG #define BIO_DEBUG
@@ -338,6 +339,10 @@ struct bio_integrity_payload {
struct work_struct bip_work; /* I/O completion */ struct work_struct bip_work; /* I/O completion */
struct bio_vec *bip_vec; struct bio_vec *bip_vec;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
struct bio_vec bip_inline_vecs[];/* embedded bvec array */ struct bio_vec bip_inline_vecs[];/* embedded bvec array */
}; };
@@ -686,6 +691,11 @@ struct bio_set {
* Hot un-plug notifier for the per-cpu cache, if used * Hot un-plug notifier for the per-cpu cache, if used
*/ */
struct hlist_node cpuhp_dead; struct hlist_node cpuhp_dead;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
static inline bool bioset_initialized(struct bio_set *bs) static inline bool bioset_initialized(struct bio_set *bs)