diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-12-13 03:50:28 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-12-13 03:50:28 +0100 |
| commit | a551d7c8deefb6d9fb45a1de03a617dd064e0419 (patch) | |
| tree | c58f83ef3edd83d55f8f574cfe7ba023e029090b /fs/ext4/ext4.h | |
| parent | dax: Fix sleep in atomic contex in grab_mapping_entry() (diff) | |
| parent | fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL (diff) | |
| download | linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.tar.xz linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.zip | |
Merge branch 'fscrypt' into dev
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 7446d390d051..2163c1e69f2a 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2329,8 +2329,8 @@ static inline void ext4_fname_free_filename(struct ext4_filename *fname) { } #define fscrypt_pullback_bio_page fscrypt_notsupp_pullback_bio_page #define fscrypt_restore_control_page fscrypt_notsupp_restore_control_page #define fscrypt_zeroout_range fscrypt_notsupp_zeroout_range -#define fscrypt_process_policy fscrypt_notsupp_process_policy -#define fscrypt_get_policy fscrypt_notsupp_get_policy +#define fscrypt_ioctl_set_policy fscrypt_notsupp_ioctl_set_policy +#define fscrypt_ioctl_get_policy fscrypt_notsupp_ioctl_get_policy #define fscrypt_has_permitted_context fscrypt_notsupp_has_permitted_context #define fscrypt_inherit_context fscrypt_notsupp_inherit_context #define fscrypt_get_encryption_info fscrypt_notsupp_get_encryption_info |