Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35997d1c authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 05ac5aa1

fs/ext4/ext4.h

+0 −5
Original line number Diff line number Diff line
@@ -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);

fs/ext4/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		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);