History

fscrypt: use FSCRYPT_* definitions, not FS_*

Update fs/crypto/ to use the new names for the UAPI constants rather than the old names, then make the old definitions conditional on !__KERNEL__.

Eric Biggers committed 7 years ago

Commit 3b6df591 parent 2336d0d6 files · +46 −43Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/fscrypt.h+2−0
@@ -55,6 +55,7 @@ struct fscrypt_key { · 54 unmodified lines
55/**********************************************************************/55/**********************************************************************/
56 56
57/* old names; don't add anything new here! */57/* old names; don't add anything new here! */
58#ifndef __KERNEL__
58#define FS_KEY_DESCRIPTOR_SIZE FSCRYPT_KEY_DESCRIPTOR_SIZE59#define FS_KEY_DESCRIPTOR_SIZE FSCRYPT_KEY_DESCRIPTOR_SIZE
59#define FS_POLICY_FLAGS_PAD_4 FSCRYPT_POLICY_FLAGS_PAD_460#define FS_POLICY_FLAGS_PAD_4 FSCRYPT_POLICY_FLAGS_PAD_4
60#define FS_POLICY_FLAGS_PAD_8 FSCRYPT_POLICY_FLAGS_PAD_861#define FS_POLICY_FLAGS_PAD_8 FSCRYPT_POLICY_FLAGS_PAD_8
@@ -76,5 +77,6 @@ struct fscrypt_key { · 15 unmodified lines
76#define FS_KEY_DESC_PREFIX FSCRYPT_KEY_DESC_PREFIX77#define FS_KEY_DESC_PREFIX FSCRYPT_KEY_DESC_PREFIX
77#define FS_KEY_DESC_PREFIX_SIZE FSCRYPT_KEY_DESC_PREFIX_SIZE78#define FS_KEY_DESC_PREFIX_SIZE FSCRYPT_KEY_DESC_PREFIX_SIZE
78#define FS_MAX_KEY_SIZE FSCRYPT_MAX_KEY_SIZE79#define FS_MAX_KEY_SIZE FSCRYPT_MAX_KEY_SIZE
80#endif /* !__KERNEL__ */
79 81
80#endif /* _UAPI_LINUX_FSCRYPT_H */82#endif /* _UAPI_LINUX_FSCRYPT_H */