From c469de24a1b715b2bfb2e140d16c91abbeac18a9 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Sat, 2 May 2020 09:38:48 +0200
Subject: [PATCH] ANDROID: GKI: iomap.h: add Android ABI padding to a structure

Try to mitigate potential future driver core api changes by adding a
padding to struct iomap_ops.

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

Bug: 151154716
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1803d5163f7a1d0320f567b983a8241777284c5e
---
 include/linux/iomap.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 5bd3cac4df9c..8a6add3abb3f 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <linux/mm_types.h>
 #include <linux/blkdev.h>
+#include <linux/android_kabi.h>
 
 struct address_space;
 struct fiemap_extent_info;
@@ -141,6 +142,9 @@ struct iomap_ops {
 	 */
 	int (*iomap_end)(struct inode *inode, loff_t pos, loff_t length,
 			ssize_t written, unsigned flags, struct iomap *iomap);
+
+	ANDROID_KABI_RESERVE(1);
+	ANDROID_KABI_RESERVE(2);
 };
 
 /*