* [PATCH] fscrypt: constify struct fscrypt_operations
@ 2017-01-05 20:42 Eric Biggers
2017-01-06 0:03 ` Richard Weinberger
2017-01-23 20:16 ` Eric Biggers
0 siblings, 2 replies; 6+ messages in thread
From: Eric Biggers @ 2017-01-05 20:42 UTC (permalink / raw)
To: linux-fsdevel
Cc: Theodore Ts'o, Jaegeuk Kim, Richard Weinberger, 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(-)
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)
{
--
2.11.0.390.gc69c2f50cf-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] fscrypt: constify struct fscrypt_operations
2017-01-05 20:42 [PATCH] fscrypt: constify struct fscrypt_operations Eric Biggers
@ 2017-01-06 0:03 ` Richard Weinberger
2017-01-06 0:09 ` Eric Biggers
2017-01-23 20:16 ` Eric Biggers
1 sibling, 1 reply; 6+ messages in thread
From: Richard Weinberger @ 2017-01-06 0:03 UTC (permalink / raw)
To: Eric Biggers, linux-fsdevel; +Cc: Theodore Ts'o, Jaegeuk Kim, Eric Biggers
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fscrypt: constify struct fscrypt_operations
2017-01-06 0:03 ` Richard Weinberger
@ 2017-01-06 0:09 ` Eric Biggers
0 siblings, 0 replies; 6+ messages in thread
From: Eric Biggers @ 2017-01-06 0:09 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-fsdevel, Theodore Ts'o, Jaegeuk Kim, Eric Biggers
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fscrypt: constify struct fscrypt_operations
2017-01-05 20:42 [PATCH] fscrypt: constify struct fscrypt_operations Eric Biggers
2017-01-06 0:03 ` Richard Weinberger
@ 2017-01-23 20:16 ` Eric Biggers
2017-02-07 20:42 ` [PATCH v2] " Eric Biggers
1 sibling, 1 reply; 6+ messages in thread
From: Eric Biggers @ 2017-01-23 20:16 UTC (permalink / raw)
To: linux-fsdevel
Cc: Theodore Ts'o, Jaegeuk Kim, Richard Weinberger, Eric Biggers
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] fscrypt: constify struct fscrypt_operations
2017-01-23 20:16 ` Eric Biggers
@ 2017-02-07 20:42 ` Eric Biggers
2017-02-08 16:17 ` Theodore Ts'o
0 siblings, 1 reply; 6+ messages in thread
From: Eric Biggers @ 2017-02-07 20:42 UTC (permalink / raw)
To: linux-fsdevel
Cc: linux-fscrypt, Theodore Ts'o, Jaegeuk Kim, Richard Weinberger,
Eric Biggers
From: Eric Biggers <ebiggers@google.com>
[v2: fix conflict with .key_prefix change]
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Richard Weinberger <richard@nod.at>
---
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(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 9d15a6293124..20539c2cd6d8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -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
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 739192d95e71..24f40197eb00 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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
diff --git a/fs/ubifs/crypto.c b/fs/ubifs/crypto.c
index 6335abcf98df..382ed428cfd2 100644
--- a/fs/ubifs/crypto.c
+++ b/fs/ubifs/crypto.c
@@ -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,
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 d9df379bacc6..f0c86f076535 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -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)
{
--
2.11.0.483.g087da7b7c-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-08 16:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-05 20:42 [PATCH] fscrypt: constify struct fscrypt_operations Eric Biggers
2017-01-06 0:03 ` Richard Weinberger
2017-01-06 0:09 ` Eric Biggers
2017-01-23 20:16 ` Eric Biggers
2017-02-07 20:42 ` [PATCH v2] " Eric Biggers
2017-02-08 16:17 ` Theodore Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).