diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-08-05 04:35:44 +0200 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2019-08-13 04:05:19 +0200 |
| commit | 3b6df59bc4d242ac5847592de55d1ff327cd4549 (patch) | |
| tree | 34a904cf036837716404795fe2c7e41172e2b490 /fs/crypto/fname.c | |
| parent | fscrypt: use FSCRYPT_ prefix for uapi constants (diff) | |
| download | linux-3b6df59bc4d242ac5847592de55d1ff327cd4549.tar.xz linux-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 'fs/crypto/fname.c')
| -rw-r--r-- | fs/crypto/fname.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 5cab3bb2d1fc..f4977d44d69b 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -182,7 +182,7 @@ bool fscrypt_fname_encrypted_size(const struct inode *inode, u32 orig_len, u32 max_len, u32 *encrypted_len_ret) { int padding = 4 << (inode->i_crypt_info->ci_flags & - FS_POLICY_FLAGS_PAD_MASK); + FSCRYPT_POLICY_FLAGS_PAD_MASK); u32 encrypted_len; if (orig_len > max_len) |