| Message ID | 20170105204243.79135-1-ebiggers3@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 05.01.2017 um 21:42 schrieb Eric Biggers: > From: Eric Biggers <ebiggers@google.com> > > Signed-off-by: Eric Biggers <ebiggers@google.com> > --- > fs/ext4/super.c | 4 ++-- > fs/f2fs/super.c | 4 ++-- > fs/ubifs/crypto.c | 2 +- > fs/ubifs/super.c | 2 +- > fs/ubifs/ubifs.h | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) Reviewed-by: Richard Weinberger <richard@nod.at> Eric, I assume you did also a build test with UBIFS enabled, right? Constifying stuff often looks easy but can uncover horrors. ;D Thanks, //richard -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 06, 2017 at 01:03:33AM +0100, Richard Weinberger wrote: > Am 05.01.2017 um 21:42 schrieb Eric Biggers: > > From: Eric Biggers <ebiggers@google.com> > > > > Signed-off-by: Eric Biggers <ebiggers@google.com> > > --- > > fs/ext4/super.c | 4 ++-- > > fs/f2fs/super.c | 4 ++-- > > fs/ubifs/crypto.c | 2 +- > > fs/ubifs/super.c | 2 +- > > fs/ubifs/ubifs.h | 2 +- > > 5 files changed, 7 insertions(+), 7 deletions(-) > > Reviewed-by: Richard Weinberger <richard@nod.at> > > Eric, I assume you did also a build test with UBIFS enabled, right? > Constifying stuff often looks easy but can uncover horrors. ;D > Yes, I compiled with ext4, f2fs, and ubifs enabled, both with and without encryption enabled for each filesystem. Eric -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jan 05, 2017 at 12:42:43PM -0800, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > Signed-off-by: Eric Biggers <ebiggers@google.com> > --- > fs/ext4/super.c | 4 ++-- > fs/f2fs/super.c | 4 ++-- > fs/ubifs/crypto.c | 2 +- > fs/ubifs/super.c | 2 +- > fs/ubifs/ubifs.h | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > Ted, are you interested in taking this patch? If you'd like I can resend to fix the conflict with the ->key_prefix change. Eric -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 66845a08a87a..2358714bbc33 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1179,7 +1179,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 = { .get_context = ext4_get_context, .key_prefix = ext4_key_prefix, .prepare_context = ext4_prepare_context, @@ -1190,7 +1190,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 diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 702638e21c76..30198e5bdf26 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1176,7 +1176,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 = { .get_context = f2fs_get_context, .key_prefix = f2fs_key_prefix, .set_context = f2fs_set_context, @@ -1185,7 +1185,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 diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c index 3402720f2b28..182419b245e7 100644 --- a/fs/ubifs/crypto.c +++ b/fs/ubifs/crypto.c @@ -86,7 +86,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, .get_context = ubifs_crypt_get_context, .set_context = ubifs_crypt_set_context, diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index e08aa04fc835..b73811bd7676 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 = { +const struct fscrypt_operations ubifs_crypt_operations = { .is_encrypted = __ubifs_crypt_is_encrypted, }; #endif diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index ca72382ce6cc..15f1d1f129b6 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -1842,7 +1842,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) {