From 6883a1e06ba8720b828e229b795aa9280fa2fb70 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 29 Jun 2020 09:15:36 -0700 Subject: [PATCH] Revert "ANDROID: fscrypt: add key removal notifier chain" This reverts commit 98261f39e992543a404353ba2d8f36cb739f329f because it was only needed for sdcardfs, which has now been removed. Bug: 157700134 Bug: 142275883 Change-Id: Iaf22521ef47d48ce9c9c0604a8b2412e3b8c1faa Signed-off-by: Eric Biggers --- fs/crypto/keyring.c | 22 ---------------------- include/linux/fscrypt.h | 14 -------------- 2 files changed, 36 deletions(-) diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c index 250a0754b0ba..6d440e2210ca 100644 --- a/fs/crypto/keyring.c +++ b/fs/crypto/keyring.c @@ -867,34 +867,12 @@ static int check_for_busy_inodes(struct super_block *sb, return -EBUSY; } -static BLOCKING_NOTIFIER_HEAD(fscrypt_key_removal_notifiers); - -/* - * Register a function to be executed when the FS_IOC_REMOVE_ENCRYPTION_KEY - * ioctl has removed a key and is about to try evicting inodes. - */ -int fscrypt_register_key_removal_notifier(struct notifier_block *nb) -{ - return blocking_notifier_chain_register(&fscrypt_key_removal_notifiers, - nb); -} -EXPORT_SYMBOL_GPL(fscrypt_register_key_removal_notifier); - -int fscrypt_unregister_key_removal_notifier(struct notifier_block *nb) -{ - return blocking_notifier_chain_unregister(&fscrypt_key_removal_notifiers, - nb); -} -EXPORT_SYMBOL_GPL(fscrypt_unregister_key_removal_notifier); - static int try_to_lock_encrypted_files(struct super_block *sb, struct fscrypt_master_key *mk) { int err1; int err2; - blocking_notifier_call_chain(&fscrypt_key_removal_notifiers, 0, NULL); - /* * An inode can't be evicted while it is dirty or has dirty pages. * Thus, we first have to clean the inodes in ->mk_decrypted_inodes. diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 516f5647b7d9..56eec073b2be 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -177,8 +177,6 @@ int fscrypt_ioctl_add_key(struct file *filp, void __user *arg); int fscrypt_ioctl_remove_key(struct file *filp, void __user *arg); int fscrypt_ioctl_remove_key_all_users(struct file *filp, void __user *arg); int fscrypt_ioctl_get_key_status(struct file *filp, void __user *arg); -int fscrypt_register_key_removal_notifier(struct notifier_block *nb); -int fscrypt_unregister_key_removal_notifier(struct notifier_block *nb); /* keysetup.c */ int fscrypt_get_encryption_info(struct inode *inode); @@ -386,18 +384,6 @@ static inline int fscrypt_ioctl_get_key_status(struct file *filp, return -EOPNOTSUPP; } -static inline int fscrypt_register_key_removal_notifier( - struct notifier_block *nb) -{ - return 0; -} - -static inline int fscrypt_unregister_key_removal_notifier( - struct notifier_block *nb) -{ - return 0; -} - /* keysetup.c */ static inline int fscrypt_get_encryption_info(struct inode *inode) {