From: Stephen Hemminger <shemminger@vyatta.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Subject: [PATCH 05/10] ext4: constify xattr_handler
Date: Thu, 13 May 2010 17:53:18 -0700 [thread overview]
Message-ID: <20100514005408.905590148@vyatta.com> (raw)
In-Reply-To: 20100514005313.884038885@vyatta.com
[-- Attachment #1: ext4-const-xattr.patch --]
[-- Type: text/plain, Size: 5016 bytes --]
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
fs/ext4/acl.c | 4 ++--
fs/ext4/xattr.c | 10 +++++-----
fs/ext4/xattr.h | 12 ++++++------
fs/ext4/xattr_security.c | 2 +-
fs/ext4/xattr_trusted.c | 2 +-
fs/ext4/xattr_user.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
--- a/fs/ext4/acl.c 2010-05-13 16:36:51.883761863 -0700
+++ b/fs/ext4/acl.c 2010-05-13 16:37:00.160557334 -0700
@@ -454,7 +454,7 @@ release_and_out:
return error;
}
-struct xattr_handler ext4_xattr_acl_access_handler = {
+const struct xattr_handler ext4_xattr_acl_access_handler = {
.prefix = POSIX_ACL_XATTR_ACCESS,
.flags = ACL_TYPE_ACCESS,
.list = ext4_xattr_list_acl_access,
@@ -462,7 +462,7 @@ struct xattr_handler ext4_xattr_acl_acce
.set = ext4_xattr_set_acl,
};
-struct xattr_handler ext4_xattr_acl_default_handler = {
+const struct xattr_handler ext4_xattr_acl_default_handler = {
.prefix = POSIX_ACL_XATTR_DEFAULT,
.flags = ACL_TYPE_DEFAULT,
.list = ext4_xattr_list_acl_default,
--- a/fs/ext4/xattr.c 2010-05-13 16:35:40.623502550 -0700
+++ b/fs/ext4/xattr.c 2010-05-13 16:38:59.742956015 -0700
@@ -97,7 +97,7 @@ static int ext4_xattr_list(struct dentry
static struct mb_cache *ext4_xattr_cache;
-static struct xattr_handler *ext4_xattr_handler_map[] = {
+static const struct xattr_handler *ext4_xattr_handler_map[] = {
[EXT4_XATTR_INDEX_USER] = &ext4_xattr_user_handler,
#ifdef CONFIG_EXT4_FS_POSIX_ACL
[EXT4_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext4_xattr_acl_access_handler,
@@ -109,7 +109,7 @@ static struct xattr_handler *ext4_xattr_
#endif
};
-struct xattr_handler *ext4_xattr_handlers[] = {
+const struct xattr_handler *ext4_xattr_handlers[] = {
&ext4_xattr_user_handler,
&ext4_xattr_trusted_handler,
#ifdef CONFIG_EXT4_FS_POSIX_ACL
@@ -122,10 +122,10 @@ struct xattr_handler *ext4_xattr_handler
NULL
};
-static inline struct xattr_handler *
+static inline const struct xattr_handler *
ext4_xattr_handler(int name_index)
{
- struct xattr_handler *handler = NULL;
+ const struct xattr_handler *handler = NULL;
if (name_index > 0 && name_index < ARRAY_SIZE(ext4_xattr_handler_map))
handler = ext4_xattr_handler_map[name_index];
@@ -332,7 +332,7 @@ ext4_xattr_list_entries(struct dentry *d
size_t rest = buffer_size;
for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
- struct xattr_handler *handler =
+ const struct xattr_handler *handler =
ext4_xattr_handler(entry->e_name_index);
if (handler) {
--- a/fs/ext4/xattr.h 2010-05-13 16:38:42.563496202 -0700
+++ b/fs/ext4/xattr.h 2010-05-13 16:39:46.394784046 -0700
@@ -65,11 +65,11 @@ struct ext4_xattr_entry {
# ifdef CONFIG_EXT4_FS_XATTR
-extern struct xattr_handler ext4_xattr_user_handler;
-extern struct xattr_handler ext4_xattr_trusted_handler;
-extern struct xattr_handler ext4_xattr_acl_access_handler;
-extern struct xattr_handler ext4_xattr_acl_default_handler;
-extern struct xattr_handler ext4_xattr_security_handler;
+extern const struct xattr_handler ext4_xattr_user_handler;
+extern const struct xattr_handler ext4_xattr_trusted_handler;
+extern const struct xattr_handler ext4_xattr_acl_access_handler;
+extern const struct xattr_handler ext4_xattr_acl_default_handler;
+extern const struct xattr_handler ext4_xattr_security_handler;
extern ssize_t ext4_listxattr(struct dentry *, char *, size_t);
@@ -86,7 +86,7 @@ extern int ext4_expand_extra_isize_ea(st
extern int init_ext4_xattr(void);
extern void exit_ext4_xattr(void);
-extern struct xattr_handler *ext4_xattr_handlers[];
+extern const struct xattr_handler *ext4_xattr_handlers[];
# else /* CONFIG_EXT4_FS_XATTR */
--- a/fs/ext4/xattr_security.c 2010-05-13 16:37:25.982511671 -0700
+++ b/fs/ext4/xattr_security.c 2010-05-13 16:37:29.742530038 -0700
@@ -69,7 +69,7 @@ ext4_init_security(handle_t *handle, str
return err;
}
-struct xattr_handler ext4_xattr_security_handler = {
+const struct xattr_handler ext4_xattr_security_handler = {
.prefix = XATTR_SECURITY_PREFIX,
.list = ext4_xattr_security_list,
.get = ext4_xattr_security_get,
--- a/fs/ext4/xattr_trusted.c 2010-05-13 16:37:33.893136689 -0700
+++ b/fs/ext4/xattr_trusted.c 2010-05-13 16:37:37.425080782 -0700
@@ -51,7 +51,7 @@ ext4_xattr_trusted_set(struct dentry *de
name, value, size, flags);
}
-struct xattr_handler ext4_xattr_trusted_handler = {
+const struct xattr_handler ext4_xattr_trusted_handler = {
.prefix = XATTR_TRUSTED_PREFIX,
.list = ext4_xattr_trusted_list,
.get = ext4_xattr_trusted_get,
--- a/fs/ext4/xattr_user.c 2010-05-13 16:37:40.893160719 -0700
+++ b/fs/ext4/xattr_user.c 2010-05-13 16:37:44.545173100 -0700
@@ -54,7 +54,7 @@ ext4_xattr_user_set(struct dentry *dentr
name, value, size, flags);
}
-struct xattr_handler ext4_xattr_user_handler = {
+const struct xattr_handler ext4_xattr_user_handler = {
.prefix = XATTR_USER_PREFIX,
.list = ext4_xattr_user_list,
.get = ext4_xattr_user_get,
next prev parent reply other threads:[~2010-05-14 2:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-14 0:53 [PATCH 00/10] Make xattr_handler constant patches Stephen Hemminger
2010-05-14 0:53 ` [PATCH 01/10] fs: xattr_handler table should be const Stephen Hemminger
2010-05-14 0:53 ` [PATCH 02/10] btrfs: constify xattr_handler Stephen Hemminger
2010-05-14 0:53 ` [PATCH 03/10] ext2: " Stephen Hemminger
2010-05-14 0:53 ` [PATCH 04/10] Subject ext3: constify xattr handlers Stephen Hemminger
2010-05-14 0:53 ` Stephen Hemminger [this message]
2010-05-14 0:53 ` [PATCH 06/10] reiserfs: constify xattr_handler Stephen Hemminger
2010-05-14 0:53 ` [PATCH 07/10] xfs: " Stephen Hemminger
2010-05-14 0:53 ` [PATCH 08/10] jffs2: " Stephen Hemminger
2010-05-14 0:53 ` [PATCH 09/10] ocfs: " Stephen Hemminger
2010-05-14 0:53 ` [PATCH 10/10] gfs: " Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100514005408.905590148@vyatta.com \
--to=shemminger@vyatta.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).