Commit 6f69f0ed authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

fscrypt: constify struct fscrypt_operations 



Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
parent b14c8e6a

fs/ext4/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static unsigned ext4_max_namelen(struct inode *inode) 
		EXT4_NAME_LEN;

}



static struct fscrypt_operations ext4_cryptops = {

static const struct fscrypt_operations ext4_cryptops = {

	.key_prefix		= "ext4:",

	.get_context		= ext4_get_context,

	.prepare_context	= ext4_prepare_context,
@@ -1184,7 +1184,7 @@ static struct fscrypt_operations ext4_cryptops = { 
	.max_namelen		= ext4_max_namelen,

};

#else

static struct fscrypt_operations ext4_cryptops = {

static const struct fscrypt_operations ext4_cryptops = {

	.is_encrypted		= ext4_encrypted_inode,

};

#endif

fs/f2fs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static unsigned f2fs_max_namelen(struct inode *inode) 
			inode->i_sb->s_blocksize : F2FS_NAME_LEN;

}



static struct fscrypt_operations f2fs_cryptops = {

static const struct fscrypt_operations f2fs_cryptops = {

	.key_prefix	= "f2fs:",

	.get_context	= f2fs_get_context,

	.set_context	= f2fs_set_context,
@@ -1179,7 +1179,7 @@ static struct fscrypt_operations f2fs_cryptops = { 
	.max_namelen	= f2fs_max_namelen,

};

#else

static struct fscrypt_operations f2fs_cryptops = {

static const struct fscrypt_operations f2fs_cryptops = {

	.is_encrypted	= f2fs_encrypted_inode,

};

#endif

fs/ubifs/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int ubifs_decrypt(const struct inode *inode, struct ubifs_data_node *dn, 
	return 0;

}



struct fscrypt_operations ubifs_crypt_operations = {

const struct fscrypt_operations ubifs_crypt_operations = {

	.flags			= FS_CFLG_OWN_PAGES,

	.key_prefix		= "ubifs:",

	.get_context		= ubifs_crypt_get_context,

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 = {

const struct fscrypt_operations ubifs_crypt_operations = {

	.is_encrypted		= __ubifs_crypt_is_encrypted,

};

#endif

fs/ubifs/ubifs.h

+1 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,7 @@ int ubifs_decrypt(const struct inode *inode, struct ubifs_data_node *dn, 
		  unsigned int *out_len, int block);

#endif



extern struct fscrypt_operations ubifs_crypt_operations;

extern const struct fscrypt_operations ubifs_crypt_operations;



static inline bool __ubifs_crypt_is_encrypted(struct inode *inode)

{