From b9f648a67c32d23b8142e083baa69b301fc50398 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 2 Jul 2021 10:25:48 -0700 Subject: [PATCH] ANDROID: GKI: fscrypt: add OEM data 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. There is an OEM who wants to add fields to this struct, so add an ANDROID_OEM_DATA_ARRAY for them to use. Bug: 173475629 Change-Id: Idfc76884fce8a5fcc0837cd9363695d5428b1624 Signed-off-by: Eric Biggers Signed-off-by: Jung Jinwoo --- include/linux/fscrypt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 095948fbd44f..e05cb512897a 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -173,6 +173,8 @@ struct fscrypt_operations { ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(3); ANDROID_KABI_RESERVE(4); + + ANDROID_OEM_DATA_ARRAY(1, 4); }; static inline struct fscrypt_info *fscrypt_get_info(const struct inode *inode)