ubifs: Constify struct inode pointer in ubifs_crypt_is_encrypted()

...and provide a non const variant for fscrypto

Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c
index 12a0072bddd394690835d30469a406b048c8fdca..25bb2062b8a392ff38ecb03d636b09270b5ac418 100644 (file)
--- 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 e85d5a47aeac4fedf5c75e71f60818c5d21f8e36..a312229472658b235997e5b48f58fcc59dd69939 100644 (file)
--- 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 27a85015e3ff1fe46911d6cd1f589fc065f9d016..74a8def1f7b73573d8f8ea7d816cac989b9dbd90 100644 (file)
--- 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, ...);