ANDROID: GKI: bio: add Android ABI padding to some structures
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:

committed by
Todd Kjos

parent
99bf8cf8fa
commit
b9081a2925
@@ -10,6 +10,7 @@
|
||||
#include <linux/ioprio.h>
|
||||
/* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */
|
||||
#include <linux/blk_types.h>
|
||||
#include <linux/android_kabi.h>
|
||||
|
||||
#define BIO_DEBUG
|
||||
|
||||
@@ -325,6 +326,10 @@ struct bio_integrity_payload {
|
||||
struct work_struct bip_work; /* I/O completion */
|
||||
|
||||
struct bio_vec *bip_vec;
|
||||
|
||||
ANDROID_KABI_RESERVE(1);
|
||||
ANDROID_KABI_RESERVE(2);
|
||||
|
||||
struct bio_vec bip_inline_vecs[];/* embedded bvec array */
|
||||
};
|
||||
|
||||
@@ -698,6 +703,11 @@ struct bio_set {
|
||||
struct bio_list rescue_list;
|
||||
struct work_struct rescue_work;
|
||||
struct workqueue_struct *rescue_workqueue;
|
||||
|
||||
ANDROID_KABI_RESERVE(1);
|
||||
ANDROID_KABI_RESERVE(2);
|
||||
ANDROID_KABI_RESERVE(3);
|
||||
ANDROID_KABI_RESERVE(4);
|
||||
};
|
||||
|
||||
struct biovec_slab {
|
||||
|
Reference in New Issue
Block a user