File tree Expand file tree Collapse file tree 3 files changed +8
-3
lines changed Expand file tree Collapse file tree 3 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ struct fscrypt_operations ubifs_crypt_operations = {
39
39
.flags = FS_CFLG_INPLACE_ENCRYPTION ,
40
40
.get_context = ubifs_crypt_get_context ,
41
41
.set_context = ubifs_crypt_set_context ,
42
- .is_encrypted = ubifs_crypt_is_encrypted ,
42
+ .is_encrypted = __ubifs_crypt_is_encrypted ,
43
43
.empty_dir = ubifs_crypt_empty_dir ,
44
44
.max_namelen = ubifs_crypt_max_namelen ,
45
45
.key_prefix = ubifs_key_prefix ,
Original file line number Diff line number Diff line change @@ -2000,7 +2000,7 @@ static struct ubifs_info *alloc_ubifs_info(struct ubi_volume_desc *ubi)
2000
2000
2001
2001
#ifndef CONFIG_UBIFS_FS_ENCRYPTION
2002
2002
struct fscrypt_operations ubifs_crypt_operations = {
2003
- .is_encrypted = ubifs_crypt_is_encrypted ,
2003
+ .is_encrypted = __ubifs_crypt_is_encrypted ,
2004
2004
};
2005
2005
#endif
2006
2006
Original file line number Diff line number Diff line change @@ -1805,13 +1805,18 @@ extern struct fscrypt_operations ubifs_crypt_operations;
1805
1805
#define fscrypt_fname_usr_to_disk fscrypt_notsupp_fname_usr_to_disk
1806
1806
#endif
1807
1807
1808
- static inline bool ubifs_crypt_is_encrypted (struct inode * inode )
1808
+ static inline bool __ubifs_crypt_is_encrypted (struct inode * inode )
1809
1809
{
1810
1810
struct ubifs_inode * ui = ubifs_inode (inode );
1811
1811
1812
1812
return ui -> flags & UBIFS_CRYPT_FL ;
1813
1813
}
1814
1814
1815
+ static inline bool ubifs_crypt_is_encrypted (const struct inode * inode )
1816
+ {
1817
+ return __ubifs_crypt_is_encrypted ((struct inode * )inode );
1818
+ }
1819
+
1815
1820
/* Normal UBIFS messages */
1816
1821
__printf (2 , 3 )
1817
1822
void ubifs_msg (const struct ubifs_info * c , const char * fmt , ...);
You can’t perform that action at this time.
0 commit comments