On 5/6/19 3:35 PM, Satya Tangirala wrote:
[ ... ]
> diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
> index 7da276159593..d6d65c88a629 100644
> --- a/fs/crypto/fscrypt_private.h
> +++ b/fs/crypto/fscrypt_private.h
> @@ -49,6 +49,16 @@ struct fscrypt_symlink_data {
> char encrypted_path[1];
> } __packed;
>
> +/* Master key referenced by FS_POLICY_FLAG_DIRECT_KEY policy */
> +struct fscrypt_master_key {
> + struct hlist_node mk_node;
> + refcount_t mk_refcount;
> + const struct fscrypt_mode *mk_mode;
> + struct crypto_skcipher *mk_ctfm;
> + u8 mk_descriptor[FS_KEY_DESCRIPTOR_SIZE];
> + u8 mk_raw[FS_MAX_KEY_SIZE];
> +};
> [ ... ]
> -/* Master key referenced by FS_POLICY_FLAG_DIRECT_KEY policy */
> -struct fscrypt_master_key {
> - struct hlist_node mk_node;
> - refcount_t mk_refcount;
> - const struct fscrypt_mode *mk_mode;
> - struct crypto_skcipher *mk_ctfm;
> - u8 mk_descriptor[FS_KEY_DESCRIPTOR_SIZE];
> - u8 mk_raw[FS_MAX_KEY_SIZE];
> -};
How about introducing the file fs/crypto/fscrypt_private.h in patch 2/4
such that the fscrypt_master_key definition does not have to be moved
around?
Thanks,
Bart.
