This patchset includes various cleanups for the new filesystem encryption code as well as some bug fixes for the FS_IOC_SET_ENCRYPTION_POLICY ioctl. Eric Biggers (13): fscrypto: remove unnecessary includes fscrypto: rename some functions for clarity fscrypto: rename functions to load and unload inode encryption info fscrypto: return bool instead of int where appropriate fscrypto: comment improvements and fixes fscrypto: crypto_alloc_skcipher() always returns an ERR_PTR(), never NULL fscrypto: simplify building key descriptor string fscrypto: use standard macros from kernel.h fscrypto: make fname_encrypt() actually return length of ciphertext fscrypto: restrict setting new policy to empty files and directories only fscrypto: restrict setting encryption policy to inode owner fscrypto: require write access to mount to set encryption policy fscrypto: improve error handling in fscrypt_set_policy() fs/crypto/crypto.c | 25 +++++---- fs/crypto/fname.c | 72 ++++++++++++++++---------- fs/crypto/keyinfo.c | 47 ++++++++--------- fs/crypto/policy.c | 131 +++++++++++++++++++++++++++-------------------- fs/f2fs/dir.c | 4 +- fs/f2fs/f2fs.h | 6 +-- fs/f2fs/file.c | 10 ++-- fs/f2fs/inode.c | 2 +- fs/f2fs/namei.c | 10 ++-- fs/f2fs/super.c | 2 +- include/linux/fscrypto.h | 81 +++++++++++++++++++++-------- 11 files changed, 236 insertions(+), 154 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html