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

Commit 2edb5df1 authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED() 



IS_ENCRYPTED() now gives the same information as
i_sb->s_cop->is_encrypted() but is more efficient, since IS_ENCRYPTED()
is just a simple flag check.  Prepare to remove ->is_encrypted() by
switching all callers to IS_ENCRYPTED().

Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent cde1fbb0

fs/crypto/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int fscrypt_d_revalidate(struct dentry *dentry, unsigned int flags) 
		return -ECHILD;



	dir = dget_parent(dentry);

	if (!d_inode(dir)->i_sb->s_cop->is_encrypted(d_inode(dir))) {

	if (!IS_ENCRYPTED(d_inode(dir))) {

		dput(dir);

		return 0;

	}

fs/crypto/fname.c

+1 −2
Original line number Diff line number Diff line
@@ -383,8 +383,7 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, 
	memset(fname, 0, sizeof(struct fscrypt_name));

	fname->usr_fname = iname;



	if (!dir->i_sb->s_cop->is_encrypted(dir) ||

				fscrypt_is_dot_dotdot(iname)) {

	if (!IS_ENCRYPTED(dir) || fscrypt_is_dot_dotdot(iname)) {

		fname->disk_name.name = (unsigned char *)iname->name;

		fname->disk_name.len = iname->len;

		return 0;

fs/crypto/keyinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ int fscrypt_get_encryption_info(struct inode *inode) 
	res = inode->i_sb->s_cop->get_context(inode, &ctx, sizeof(ctx));

	if (res < 0) {

		if (!fscrypt_dummy_context_enabled(inode) ||

		    inode->i_sb->s_cop->is_encrypted(inode))

		    IS_ENCRYPTED(inode))

			return res;

		/* Fake up a context for an unencrypted directory */

		memset(&ctx, 0, sizeof(ctx));

fs/crypto/policy.c

+3 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg) 
	struct fscrypt_policy policy;

	int res;



	if (!inode->i_sb->s_cop->is_encrypted(inode))

	if (!IS_ENCRYPTED(inode))

		return -ENODATA;



	res = inode->i_sb->s_cop->get_context(inode, &ctx, sizeof(ctx));
@@ -167,11 +167,11 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child) 
		return 1;



	/* No restrictions if the parent directory is unencrypted */

	if (!cops->is_encrypted(parent))

	if (!IS_ENCRYPTED(parent))

		return 1;



	/* Encrypted directories must not contain unencrypted files */

	if (!cops->is_encrypted(child))

	if (!IS_ENCRYPTED(child))

		return 0;



	/*

include/linux/fscrypt_notsupp.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline int fscrypt_setup_filename(struct inode *dir, 
					 const struct qstr *iname,

					 int lookup, struct fscrypt_name *fname)

{

	if (dir->i_sb->s_cop->is_encrypted(dir))

	if (IS_ENCRYPTED(dir))

		return -EOPNOTSUPP;



	memset(fname, 0, sizeof(struct fscrypt_name));