diff options
| -rw-r--r-- | fs/ubifs/crypto.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c index 12a0072bddd3..25bb2062b8a3 100644 --- a/fs/ubifs/crypto.c +++ b/fs/ubifs/crypto.c @@ -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, diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index e85d5a47aeac..a31222947265 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -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 diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 27a85015e3ff..74a8def1f7b7 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -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, ...); |