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>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index f9958f6617890c0d8b19e818e832c4c6445b137a..7446d390d05116947260c555a01be6fd243a34c2 100644 (file)
--- 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 2faeb3cdbbb3dbc955335a927064770d1b14c9af..560afe08a5cac4211c0010f0ab440d9190ceebed 100644 (file)
--- 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);