diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-08-04 19:35:44 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-08-12 19:05:19 -0700 |
| commit | 3b6df59bc4d242ac5847592de55d1ff327cd4549 (patch) | |
| tree | 34a904cf036837716404795fe2c7e41172e2b490 /include/uapi | |
| parent | 2336d0deb2d4680349de59d6fbdfc338437be191 (diff) | |
| download | linux-stable-3b6df59bc4d242ac5847592de55d1ff327cd4549.tar.gz linux-stable-3b6df59bc4d242ac5847592de55d1ff327cd4549.tar.bz2 linux-stable-3b6df59bc4d242ac5847592de55d1ff327cd4549.zip | |
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__.
Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/fscrypt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h index 674b0452ef57..29a945d165de 100644 --- a/include/uapi/linux/fscrypt.h +++ b/include/uapi/linux/fscrypt.h @@ -55,6 +55,7 @@ struct fscrypt_key { /**********************************************************************/ /* old names; don't add anything new here! */ +#ifndef __KERNEL__ #define FS_KEY_DESCRIPTOR_SIZE FSCRYPT_KEY_DESCRIPTOR_SIZE #define FS_POLICY_FLAGS_PAD_4 FSCRYPT_POLICY_FLAGS_PAD_4 #define FS_POLICY_FLAGS_PAD_8 FSCRYPT_POLICY_FLAGS_PAD_8 @@ -76,5 +77,6 @@ struct fscrypt_key { #define FS_KEY_DESC_PREFIX FSCRYPT_KEY_DESC_PREFIX #define FS_KEY_DESC_PREFIX_SIZE FSCRYPT_KEY_DESC_PREFIX_SIZE #define FS_MAX_KEY_SIZE FSCRYPT_MAX_KEY_SIZE +#endif /* !__KERNEL__ */ #endif /* _UAPI_LINUX_FSCRYPT_H */ |