diff options
| author | Eric Biggers <ebiggers@google.com> | 2016-12-01 11:54:18 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-12-01 11:54:18 -0500 |
| commit | 35997d1ce8b01f9f002dd080c59e22430ead6db1 (patch) | |
| tree | 1d805b83081ebfcd718dc03978a634d60c0b19f5 /fs/ext4 | |
| parent | 05ac5aa18abd7db341e54df4ae2b4c98ea0e43b7 (diff) | |
| download | linux-35997d1ce8b01f9f002dd080c59e22430ead6db1.tar.gz linux-35997d1ce8b01f9f002dd080c59e22430ead6db1.tar.bz2 linux-35997d1ce8b01f9f002dd080c59e22430ead6db1.zip | |
ext4: get rid of ext4_sb_has_crypto()
ext4_sb_has_crypto() just called through to ext4_has_feature_encrypt(),
and all callers except one were already using the latter. So remove it
and switch its one caller to ext4_has_feature_encrypt().
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ext4.h | 5 | ||||
| -rw-r--r-- | fs/ext4/ioctl.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f9958f661789..7446d390d051 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2272,11 +2272,6 @@ extern unsigned ext4_free_clusters_after_init(struct super_block *sb, struct ext4_group_desc *gdp); ext4_fsblk_t ext4_inode_to_goal_block(struct inode *); -static inline int ext4_sb_has_crypto(struct super_block *sb) -{ - return ext4_has_feature_encrypt(sb); -} - static inline bool ext4_encrypted_inode(struct inode *inode) { return ext4_test_inode_flag(inode, EXT4_INODE_ENCRYPT); diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 2faeb3cdbbb3..560afe08a5ca 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -806,7 +806,7 @@ resizefs_out: struct ext4_sb_info *sbi = EXT4_SB(sb); handle_t *handle; - if (!ext4_sb_has_crypto(sb)) + if (!ext4_has_feature_encrypt(sb)) return -EOPNOTSUPP; if (uuid_is_zero(sbi->s_es->s_encrypt_pw_salt)) { err = mnt_want_write_file(filp); |