diff options
| author | Chandan Rajendra | 2018-12-12 10:50:12 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2019-01-24 05:56:43 +0100 |
| commit | 643fa9612bf1a29153eee46fd398117632f93cbe (patch) | |
| tree | cdab043a388581eadf969671e33c440b4c6f36b1 /fs/ext4/ioctl.c | |
| parent | f2fs: use IS_ENCRYPTED() to check encryption status (diff) | |
| download | kernel-qcow2-linux-643fa9612bf1a29153eee46fd398117632f93cbe.tar.gz kernel-qcow2-linux-643fa9612bf1a29153eee46fd398117632f93cbe.tar.xz kernel-qcow2-linux-643fa9612bf1a29153eee46fd398117632f93cbe.zip | |
fscrypt: remove filesystem specific build config option
In order to have a common code base for fscrypt "post read" processing
for all filesystems which support encryption, this commit removes
filesystem specific build config option (e.g. CONFIG_EXT4_FS_ENCRYPTION)
and replaces it with a build option (i.e. CONFIG_FS_ENCRYPTION) whose
value affects all the filesystems making use of fscrypt.
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/ext4/ioctl.c')
| -rw-r--r-- | fs/ext4/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index d37dafa1d133..d26bcac291bb 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -210,7 +210,7 @@ journal_err_out: return err; } -#ifdef CONFIG_EXT4_FS_ENCRYPTION +#ifdef CONFIG_FS_ENCRYPTION static int uuid_is_zero(__u8 u[16]) { int i; @@ -978,7 +978,7 @@ resizefs_out: return fscrypt_ioctl_set_policy(filp, (const void __user *)arg); case EXT4_IOC_GET_ENCRYPTION_PWSALT: { -#ifdef CONFIG_EXT4_FS_ENCRYPTION +#ifdef CONFIG_FS_ENCRYPTION int err, err2; struct ext4_sb_info *sbi = EXT4_SB(sb); handle_t *handle; |