leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ubifs: Constify struct inode pointer in ubifs_crypt_is_encrypted()

Browse Source 
...and provide a non const variant for fscrypto

Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Richard Weinberger 2016-10-21 14:03:19 +02:00
parent f1f52d6b02
commit 1ee77870c9
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ubifs/crypto.c
View File

@ -39,7 +39,7 @@ struct fscrypt_operations ubifs_crypt_operations = {
.flags = FS_CFLG_INPLACE_ENCRYPTION, .flags = FS_CFLG_INPLACE_ENCRYPTION,
.get_context = ubifs_crypt_get_context, .get_context = ubifs_crypt_get_context,
.set_context = ubifs_crypt_set_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, .empty_dir = ubifs_crypt_empty_dir,
.max_namelen = ubifs_crypt_max_namelen, .max_namelen = ubifs_crypt_max_namelen,
.key_prefix = ubifs_key_prefix, .key_prefix = ubifs_key_prefix,

2
fs/ubifs/super.c
View File

@ -2000,7 +2000,7 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi)
#ifndef CONFIG_UBIFS_FS_ENCRYPTION #ifndef CONFIG_UBIFS_FS_ENCRYPTION
struct fscrypt_operations ubifs_crypt_operations = { struct fscrypt_operations ubifs_crypt_operations = {
.is_encrypted = ubifs_crypt_is_encrypted, .is_encrypted = __ubifs_crypt_is_encrypted,
}; };
#endif #endif

7
fs/ubifs/ubifs.h
View File

@ -1805,13 +1805,18 @@ extern struct fscrypt_operations ubifs_crypt_operations;
#define fscrypt_fname_usr_to_disk fscrypt_notsupp_fname_usr_to_disk #define fscrypt_fname_usr_to_disk fscrypt_notsupp_fname_usr_to_disk
#endif #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); struct ubifs_inode *ui = ubifs_inode(inode);
return ui->flags & UBIFS_CRYPT_FL; 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 */ /* Normal UBIFS messages */
__printf(2, 3) __printf(2, 3)
void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...); void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...);