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

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

fscrypt: split fscrypt_dummy_context_enabled() into supp/notsupp versions 



fscrypt_dummy_context_enabled() accesses ->s_cop, which now is only set
when the filesystem is built with encryption support.  This didn't
actually matter because no filesystems called it.  However, it will
start being used soon, so fix it by moving it from fscrypt.h to
fscrypt_supp.h and stubbing it out in fscrypt_notsupp.h.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent e298b5de

include/linux/fscrypt.h

+0 −8
Original line number Diff line number Diff line
@@ -75,14 +75,6 @@ struct fscrypt_operations { 
/* Maximum value for the third parameter of fscrypt_operations.set_context(). */

#define FSCRYPT_SET_CONTEXT_MAX_SIZE	28



static inline bool fscrypt_dummy_context_enabled(struct inode *inode)

{

	if (inode->i_sb->s_cop->dummy_context &&

				inode->i_sb->s_cop->dummy_context(inode))

		return true;

	return false;

}



static inline bool fscrypt_valid_enc_modes(u32 contents_mode,

					u32 filenames_mode)

{

include/linux/fscrypt_notsupp.h

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ static inline bool fscrypt_has_encryption_key(const struct inode *inode) 
	return false;

}



static inline bool fscrypt_dummy_context_enabled(struct inode *inode)

{

	return false;

}



/* crypto.c */

static inline struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode,

						  gfp_t gfp_flags)

include/linux/fscrypt_supp.h

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ static inline bool fscrypt_has_encryption_key(const struct inode *inode) 
	return (inode->i_crypt_info != NULL);

}



static inline bool fscrypt_dummy_context_enabled(struct inode *inode)

{

	return inode->i_sb->s_cop->dummy_context &&

		inode->i_sb->s_cop->dummy_context(inode);

}



/* crypto.c */

extern struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *, gfp_t);

extern void fscrypt_release_ctx(struct fscrypt_ctx *);