From 194fd9239ae697974aad9e038d4aea509bf45c43 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 2 Jul 2021 10:25:47 -0700 Subject: [PATCH] ANDROID: GKI: fscrypt: add ABI padding to struct fscrypt_operations 'struct fscrypt_operations' shouldn't really be part of the KMI, as there's no reason for loadable modules to use it. However, due to the way MODVERSIONS calculates symbol CRCs by recursively dereferencing structures, changes to 'struct fscrypt_operations' affect the CRCs of KMI functions exported from certain core kernel files such as fs/dcache.c. That brings it in-scope for the KMI freeze. Therefore, add some reserved fields to this struct for LTS updates. Bug: 151154716 Change-Id: Ic3bf66c93a9be167a0a5b257bd55e2719d99a1b4 Signed-off-by: Eric Biggers --- include/linux/fscrypt.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 554b219c62cd..760d13699b0b 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -70,6 +70,11 @@ struct fscrypt_operations { int (*get_num_devices)(struct super_block *sb); void (*get_devices)(struct super_block *sb, struct request_queue **devs); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; static inline struct fscrypt_info *fscrypt_get_info(const struct inode *inode)