[PATCH] Make inode_ops->setxattr value parameter const

Patch from Andreas Gruenbacher <agruen@suse.de>

The setxattr inode operation is defined like this in 2.4 and 2.5:

        int (*setxattr) (struct dentry *dentry, const char *name,
                         void *value, size_t size, int flags);

the original type of the value parameter was `const void *'; the const
obviously has been lost at some point. The definition should be:

        int (*setxattr) (struct dentry *dentry, const char *name,
                         const void *value, size_t size, int flags);

diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 30d8ecdc17c7ce6d963cd63201324798a4b1c783..5a4592b0b7b6a5bc84aa027e5a487df8adaf7495 100644 (file)
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -230,7 +230,7 @@ ext2_listxattr(struct dentry *dentry, char *buffer, size_t size)
  */
 int
 ext2_setxattr(struct dentry *dentry, const char *name,
-             void *value, size_t size, int flags)
+             const void *value, size_t size, int flags)
 {
        struct ext2_xattr_handler *handler;
        struct inode *inode = dentry->d_inode;

diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h
index 4414b30d9185586c5f6a4f95535b3ec66a3a6d9e..612bfc626af54bdf2b95153dd35003c30a8f8572 100644 (file)
--- a/fs/ext2/xattr.h
+++ b/fs/ext2/xattr.h
@@ -67,7 +67,7 @@ struct ext2_xattr_handler {
 extern int ext2_xattr_register(int, struct ext2_xattr_handler *);
 extern void ext2_xattr_unregister(int, struct ext2_xattr_handler *);
 
-extern int ext2_setxattr(struct dentry *, const char *, void *, size_t, int);
+extern int ext2_setxattr(struct dentry *, const char *, const void *, size_t, int);
 extern ssize_t ext2_getxattr(struct dentry *, const char *, void *, size_t);
 extern ssize_t ext2_listxattr(struct dentry *, char *, size_t);
 extern int ext2_removexattr(struct dentry *, const char *);

diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index 75d4659507f47a65ad4f18e7107e20692f293f92..7b42a75dd579d5a8ec7b70e9a2ec64e9a881819c 100644 (file)
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -223,7 +223,7 @@ ext3_listxattr(struct dentry *dentry, char *buffer, size_t size)
  */
 int
 ext3_setxattr(struct dentry *dentry, const char *name,
-             void *value, size_t size, int flags)
+             const void *value, size_t size, int flags)
 {
        struct ext3_xattr_handler *handler;
        struct inode *inode = dentry->d_inode;

diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h
index 1e3a5149207ea21e6303dcb02e680e9f14e5969d..f8a6e6dac22fa1b9f8ac96b8fab16fe591e6c09e 100644 (file)
--- a/fs/ext3/xattr.h
+++ b/fs/ext3/xattr.h
@@ -66,7 +66,7 @@ struct ext3_xattr_handler {
 extern int ext3_xattr_register(int, struct ext3_xattr_handler *);
 extern void ext3_xattr_unregister(int, struct ext3_xattr_handler *);
 
-extern int ext3_setxattr(struct dentry *, const char *, void *, size_t, int);
+extern int ext3_setxattr(struct dentry *, const char *, const void *, size_t, int);
 extern ssize_t ext3_getxattr(struct dentry *, const char *, void *, size_t);
 extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);
 extern int ext3_removexattr(struct dentry *, const char *);

diff --git a/fs/jfs/jfs_xattr.h b/fs/jfs/jfs_xattr.h
index 6cb1c8b70e890db500f1127c1d02f0833d966f81..acc196e66c706ed91a432b7924213a7ea871e3f8 100644 (file)
--- a/fs/jfs/jfs_xattr.h
+++ b/fs/jfs/jfs_xattr.h
@@ -52,9 +52,9 @@ struct jfs_ea_list {
 #define        END_EALIST(ealist) \
        ((struct jfs_ea *) (((char *) (ealist)) + EALIST_SIZE(ealist)))
 
-extern int __jfs_setxattr(struct inode *, const char *, void *, size_t,
-                       int);
-extern int jfs_setxattr(struct dentry *, const char *, void *, size_t,
+extern int __jfs_setxattr(struct inode *, const char *, const void *, size_t,
+                         int);
+extern int jfs_setxattr(struct dentry *, const char *, const void *, size_t,
                        int);
 extern ssize_t __jfs_getxattr(struct inode *, const char *, void *, size_t);
 extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t);

diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 873ef6fbf8bf4d1b6dd0093357c20d42798e4e33..a9c455de618be95ac5b77baa083e7ba6e4fc0e3f 100644 (file)
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -706,7 +706,7 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
 }
 
 static int can_set_xattr(struct inode *inode, const char *name,
-                        void *value, size_t value_len)
+                        const void *value, size_t value_len)
 {
        if (IS_RDONLY(inode))
                return -EROFS;
@@ -735,7 +735,7 @@ static int can_set_xattr(struct inode *inode, const char *name,
 #endif
 }
 
-int __jfs_setxattr(struct inode *inode, const char *name, void *value,
+int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
                   size_t value_len, int flags)
 {
        struct jfs_ea_list *ealist;
@@ -874,7 +874,7 @@ int __jfs_setxattr(struct inode *inode, const char *name, void *value,
        return rc;
 }
 
-int jfs_setxattr(struct dentry *dentry, const char *name, void *value,
+int jfs_setxattr(struct dentry *dentry, const char *name, const void *value,
                 size_t value_len, int flags)
 {
        if (value == NULL) {    /* empty EA, do not remove */

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 86c370cc33552e3b6c32f5f5a313dbcf9915b49c..5183f5f7c91cac2de39a0ab9ef3686bb804f308e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -781,7 +781,7 @@ struct inode_operations {
        int (*permission) (struct inode *, int);
        int (*setattr) (struct dentry *, struct iattr *);
        int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
-       int (*setxattr) (struct dentry *, const char *, void *, size_t, int);
+       int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
        ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
        ssize_t (*listxattr) (struct dentry *, char *, size_t);
        int (*removexattr) (struct dentry *, const char *);