Patch 1 of this series reworks the fscrypt filesystem-level keyring to not use the keyrings subsystem as part of its internal implementation (except for ->mk_users, which remains unchanged for now). This fixes several issues, described in the patch itself. This is also a prerequisite for eliminating the direct use of struct request_queue from filesystem code, as discussed at https://lore.kernel.org/linux-fscrypt/20220721125929.1866403-1-hch@xxxxxx/T/#u Patches 2-3 eliminate the direct uses of struct request_queue from fs/crypto/ that don't require block layer changes. (The remaining uses will be eliminated later by changing some of the blk-crypto functions.) Changed in v4: - Restored a NULL check in fscrypt_destroy_inline_crypt_key() that I had accidentally dropped. - Tweaked patches 2 and 3 slightly so that patch 2 no longer makes as many changes that patch 3 then undoes. Changed in v3: - Added patch "fscrypt: work on block_devices instead of request_queues" Changed in v2: - Don't compare uninitialized bytes of struct fscrypt_key_specifier - Don't use refcount_dec_and_lock() unnecessarily - Other minor cleanups Christoph Hellwig (1): fscrypt: work on block_devices instead of request_queues Eric Biggers (2): fscrypt: stop using keyrings subsystem for fscrypt_master_key fscrypt: stop holding extra request_queue references fs/crypto/fscrypt_private.h | 74 ++++-- fs/crypto/hooks.c | 10 +- fs/crypto/inline_crypt.c | 147 ++++++----- fs/crypto/keyring.c | 495 +++++++++++++++++++----------------- fs/crypto/keysetup.c | 89 +++---- fs/crypto/keysetup_v1.c | 4 +- fs/crypto/policy.c | 8 +- fs/f2fs/super.c | 24 +- fs/super.c | 2 +- include/linux/fs.h | 2 +- include/linux/fscrypt.h | 25 +- 11 files changed, 462 insertions(+), 418 deletions(-) base-commit: 1c23f9e627a7b412978b4e852793c5e3c3efc555 -- 2.37.2
