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

Commit 7319c5ee authored Oct 09, 2017 by Eric Biggers Committed by Jaegeuk Kim Jan 04, 2018

fscrypt: remove ->is_encrypted()



Now that all callers of fscrypt_operations.is_encrypted() have been
switched to IS_ENCRYPTED(), remove ->is_encrypted().

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

parent d824e3a7

fs/f2fs/super.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1788,13 +1788,11 @@ static const struct fscrypt_operations f2fs_cryptops = {
	.key_prefix = "f2fs:",		.key_prefix = "f2fs:",
	.get_context = f2fs_get_context,		.get_context = f2fs_get_context,
	.set_context = f2fs_set_context,		.set_context = f2fs_set_context,
	.is_encrypted = f2fs_encrypted_inode,
	.empty_dir = f2fs_empty_dir,		.empty_dir = f2fs_empty_dir,
	.max_namelen = f2fs_max_namelen,		.max_namelen = f2fs_max_namelen,
	};		};
	#else		#else
	static const struct fscrypt_operations f2fs_cryptops = {		static const struct fscrypt_operations f2fs_cryptops = {
	.is_encrypted = f2fs_encrypted_inode,
	};		};
	#endif		#endif

include/linux/fscrypt.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,6 @@ struct fscrypt_operations {
	int (get_context)(struct inode , void *, size_t);		int (get_context)(struct inode , void *, size_t);
	int (set_context)(struct inode , const void , size_t, void );		int (set_context)(struct inode , const void , size_t, void );
	bool (dummy_context)(struct inode );		bool (dummy_context)(struct inode );
	bool (is_encrypted)(struct inode );
	bool (empty_dir)(struct inode );		bool (empty_dir)(struct inode );
	unsigned (max_namelen)(struct inode );		unsigned (max_namelen)(struct inode );
	};		};