Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9d4f1b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I0397ede2e11560ad9422cd7765434fcd4f7a6dd8
parent fa1f82f6

include/linux/bio.h

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/ioprio.h>

#include <linux/bug.h>

#include <linux/bio-crypt-ctx.h>

#include <linux/android_kabi.h>



#ifdef CONFIG_BLOCK
@@ -357,6 +358,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[0];/* embedded bvec array */

};
@@ -762,6 +767,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 {