Browse Source

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>
Eric Biggers 8 years ago
parent
commit
35997d1ce8
2 changed files with 1 additions and 6 deletions
  1. 0 5
      fs/ext4/ext4.h
  2. 1 1
      fs/ext4/ioctl.c

+ 0 - 5
fs/ext4/ext4.h

@@ -2272,11 +2272,6 @@ extern unsigned ext4_free_clusters_after_init(struct super_block *sb,
 					      struct ext4_group_desc *gdp);
 					      struct ext4_group_desc *gdp);
 ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
 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)
 static inline bool ext4_encrypted_inode(struct inode *inode)
 {
 {
 	return ext4_test_inode_flag(inode, EXT4_INODE_ENCRYPT);
 	return ext4_test_inode_flag(inode, EXT4_INODE_ENCRYPT);

+ 1 - 1
fs/ext4/ioctl.c

@@ -806,7 +806,7 @@ resizefs_out:
 		struct ext4_sb_info *sbi = EXT4_SB(sb);
 		struct ext4_sb_info *sbi = EXT4_SB(sb);
 		handle_t *handle;
 		handle_t *handle;
 
 
-		if (!ext4_sb_has_crypto(sb))
+		if (!ext4_has_feature_encrypt(sb))
 			return -EOPNOTSUPP;
 			return -EOPNOTSUPP;
 		if (uuid_is_zero(sbi->s_es->s_encrypt_pw_salt)) {
 		if (uuid_is_zero(sbi->s_es->s_encrypt_pw_salt)) {
 			err = mnt_want_write_file(filp);
 			err = mnt_want_write_file(filp);