fs: xattr_handler table should be const

The entries in xattr handler table should be immutable (ie const)
like other operation tables.

Later patches convert common filesystems. Uncoverted filesystems
will still work, but will generate a compiler warning.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index fe5df5457656e43fa2757a37b322c106b63af17f..99800e564157ed5d3bb78b6e80c6d7f5b7d32051 100644 (file)
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -201,7 +201,7 @@ generic_check_acl(struct inode *inode, int mask)
        return -EAGAIN;
 }
 
-struct xattr_handler generic_acl_access_handler = {
+const struct xattr_handler generic_acl_access_handler = {
        .prefix = POSIX_ACL_XATTR_ACCESS,
        .flags  = ACL_TYPE_ACCESS,
        .list   = generic_acl_list,
@@ -209,7 +209,7 @@ struct xattr_handler generic_acl_access_handler = {
        .set    = generic_acl_set,
 };
 
-struct xattr_handler generic_acl_default_handler = {
+const struct xattr_handler generic_acl_default_handler = {
        .prefix = POSIX_ACL_XATTR_DEFAULT,
        .flags  = ACL_TYPE_DEFAULT,
        .list   = generic_acl_list,

diff --git a/fs/xattr.c b/fs/xattr.c
index 46f87e828b484ebabf84422150eb8b9938481971..01bb8135e14aafcc4b8782b749374e6b79049afc 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -590,10 +590,10 @@ strcmp_prefix(const char *a, const char *a_prefix)
 /*
  * Find the xattr_handler with the matching prefix.
  */
-static struct xattr_handler *
-xattr_resolve_name(struct xattr_handler **handlers, const char **name)
+static const struct xattr_handler *
+xattr_resolve_name(const struct xattr_handler **handlers, const char **name)
 {
-       struct xattr_handler *handler;
+       const struct xattr_handler *handler;
 
        if (!*name)
                return NULL;
@@ -614,7 +614,7 @@ xattr_resolve_name(struct xattr_handler **handlers, const char **name)
 ssize_t
 generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size)
 {
-       struct xattr_handler *handler;
+       const struct xattr_handler *handler;
 
        handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
        if (!handler)
@@ -629,7 +629,7 @@ generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t s
 ssize_t
 generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
-       struct xattr_handler *handler, **handlers = dentry->d_sb->s_xattr;
+       const struct xattr_handler *handler, **handlers = dentry->d_sb->s_xattr;
        unsigned int size = 0;
 
        if (!buffer) {
@@ -659,7 +659,7 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 int
 generic_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags)
 {
-       struct xattr_handler *handler;
+       const struct xattr_handler *handler;
 
        if (size == 0)
                value = "";  /* empty EA, do not remove */
@@ -676,7 +676,7 @@ generic_setxattr(struct dentry *dentry, const char *name, const void *value, siz
 int
 generic_removexattr(struct dentry *dentry, const char *name)
 {
-       struct xattr_handler *handler;
+       const struct xattr_handler *handler;
 
        handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
        if (!handler)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index d51256bc6328fdbd7c9759385d80a7ef7f7ad73e..6660db898c412adfaac260ddab78aa5ed4ef398f 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1336,7 +1336,7 @@ struct super_block {
 #ifdef CONFIG_SECURITY
        void                    *s_security;
 #endif
-       struct xattr_handler    **s_xattr;
+       const struct xattr_handler **s_xattr;
 
        struct list_head        s_inodes;       /* all inodes */
        struct hlist_head       s_anon;         /* anonymous dentries for (nfs) exporting */

diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h
index ca666d18ed6769418d1de90e45b690ec9e9eae36..574bea4013b618d0816d2280ced3670fa4e75bd4 100644 (file)
--- a/include/linux/generic_acl.h
+++ b/include/linux/generic_acl.h
@@ -5,8 +5,8 @@
 
 struct inode;
 
-extern struct xattr_handler generic_acl_access_handler;
-extern struct xattr_handler generic_acl_default_handler;
+extern const struct xattr_handler generic_acl_access_handler;
+extern const struct xattr_handler generic_acl_default_handler;
 
 int generic_acl_init(struct inode *, struct inode *);
 int generic_acl_chmod(struct inode *);

diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index fb9b7e6e1e2d74f5750248efff6cb9cc956b2a18..0cfa1e9c4cc152239895304d67c6d1500cff7044 100644 (file)
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -37,7 +37,7 @@ struct inode;
 struct dentry;
 
 struct xattr_handler {
-       char *prefix;
+       const char *prefix;
        int flags;      /* fs private flags passed back to the handlers */
        size_t (*list)(struct dentry *dentry, char *list, size_t list_size,
                       const char *name, size_t name_len, int handler_flags);

diff --git a/mm/shmem.c b/mm/shmem.c
index eef4ebea51581f9aa8a6d2244f8ce5fa57f99c22..717aa62ff127efb05125d0b6c510c259f53e9c24 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2071,14 +2071,14 @@ static int shmem_xattr_security_set(struct dentry *dentry, const char *name,
                                          size, flags);
 }
 
-static struct xattr_handler shmem_xattr_security_handler = {
+static const struct xattr_handler shmem_xattr_security_handler = {
        .prefix = XATTR_SECURITY_PREFIX,
        .list   = shmem_xattr_security_list,
        .get    = shmem_xattr_security_get,
        .set    = shmem_xattr_security_set,
 };
 
-static struct xattr_handler *shmem_xattr_handlers[] = {
+static const struct xattr_handler *shmem_xattr_handlers[] = {
        &generic_acl_access_handler,
        &generic_acl_default_handler,
        &shmem_xattr_security_handler,