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

Commit 1ee77870 authored by Richard Weinberger's avatar Richard Weinberger
Browse files

ubifs: Constify struct inode pointer in ubifs_crypt_is_encrypted() 



...and provide a non const variant for fscrypto

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent f1f52d6b

fs/ubifs/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct fscrypt_operations ubifs_crypt_operations = { 
	.flags			= FS_CFLG_INPLACE_ENCRYPTION,

	.get_context		= ubifs_crypt_get_context,

	.set_context		= ubifs_crypt_set_context,

	.is_encrypted		= ubifs_crypt_is_encrypted,

	.is_encrypted		= __ubifs_crypt_is_encrypted,

	.empty_dir		= ubifs_crypt_empty_dir,

	.max_namelen		= ubifs_crypt_max_namelen,

	.key_prefix		= ubifs_key_prefix,

fs/ubifs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -2000,7 +2000,7 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi) 


#ifndef CONFIG_UBIFS_FS_ENCRYPTION

struct fscrypt_operations ubifs_crypt_operations = {

	.is_encrypted		= ubifs_crypt_is_encrypted,

	.is_encrypted		= __ubifs_crypt_is_encrypted,

};

#endif

fs/ubifs/ubifs.h

+6 −1
Original line number Diff line number Diff line
@@ -1805,13 +1805,18 @@ extern struct fscrypt_operations ubifs_crypt_operations; 
#define fscrypt_fname_usr_to_disk       fscrypt_notsupp_fname_usr_to_disk

#endif



static inline bool ubifs_crypt_is_encrypted(struct inode *inode)

static inline bool __ubifs_crypt_is_encrypted(struct inode *inode)

{

	struct ubifs_inode *ui = ubifs_inode(inode);



	return ui->flags & UBIFS_CRYPT_FL;

}



static inline bool ubifs_crypt_is_encrypted(const struct inode *inode)

{

	return __ubifs_crypt_is_encrypted((struct inode *)inode);

}



/* Normal UBIFS messages */

__printf(2, 3)

void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...);