aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2013-07-24 16:44:02 -0400
committerJames Morris <james.l.morris@oracle.com>2013-07-25 05:30:03 -0400
commit9548906b2bb7ff09e12c013a55d669bef2c8e121 (patch)
treeb75ba2bc69d82c1040cac0ea9113a17b39e82b93 /include
parentbe0306bcc3a0b0725b0f99b06d56a29a6d906b7c (diff)
xattr: Constify ->name member of "struct xattr".
Since everybody sets kstrdup()ed constant string to "struct xattr"->name but nobody modifies "struct xattr"->name , we can omit kstrdup() and its failure checking by constifying ->name member of "struct xattr". Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Reviewed-by: Joel Becker <jlbec@evilplan.org> [ocfs2] Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> Acked-by: Casey Schaufler <casey@schaufler-ca.com> Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Reviewed-by: Paul Moore <paul@paul-moore.com> Tested-by: Paul Moore <paul@paul-moore.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/security.h8
-rw-r--r--include/linux/xattr.h2
-rw-r--r--include/uapi/linux/reiserfs_xattr.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 7ce53ae1266b..9d37e2b9d3ec 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1492,7 +1492,7 @@ struct security_operations {
1492 int (*inode_alloc_security) (struct inode *inode); 1492 int (*inode_alloc_security) (struct inode *inode);
1493 void (*inode_free_security) (struct inode *inode); 1493 void (*inode_free_security) (struct inode *inode);
1494 int (*inode_init_security) (struct inode *inode, struct inode *dir, 1494 int (*inode_init_security) (struct inode *inode, struct inode *dir,
1495 const struct qstr *qstr, char **name, 1495 const struct qstr *qstr, const char **name,
1496 void **value, size_t *len); 1496 void **value, size_t *len);
1497 int (*inode_create) (struct inode *dir, 1497 int (*inode_create) (struct inode *dir,
1498 struct dentry *dentry, umode_t mode); 1498 struct dentry *dentry, umode_t mode);
@@ -1770,7 +1770,7 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
1770 const struct qstr *qstr, 1770 const struct qstr *qstr,
1771 initxattrs initxattrs, void *fs_data); 1771 initxattrs initxattrs, void *fs_data);
1772int security_old_inode_init_security(struct inode *inode, struct inode *dir, 1772int security_old_inode_init_security(struct inode *inode, struct inode *dir,
1773 const struct qstr *qstr, char **name, 1773 const struct qstr *qstr, const char **name,
1774 void **value, size_t *len); 1774 void **value, size_t *len);
1775int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode); 1775int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);
1776int security_inode_link(struct dentry *old_dentry, struct inode *dir, 1776int security_inode_link(struct dentry *old_dentry, struct inode *dir,
@@ -2094,8 +2094,8 @@ static inline int security_inode_init_security(struct inode *inode,
2094static inline int security_old_inode_init_security(struct inode *inode, 2094static inline int security_old_inode_init_security(struct inode *inode,
2095 struct inode *dir, 2095 struct inode *dir,
2096 const struct qstr *qstr, 2096 const struct qstr *qstr,
2097 char **name, void **value, 2097 const char **name,
2098 size_t *len) 2098 void **value, size_t *len)
2099{ 2099{
2100 return -EOPNOTSUPP; 2100 return -EOPNOTSUPP;
2101} 2101}
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index fdbafc6841cf..91b0a68d38dc 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -31,7 +31,7 @@ struct xattr_handler {
31}; 31};
32 32
33struct xattr { 33struct xattr {
34 char *name; 34 const char *name;
35 void *value; 35 void *value;
36 size_t value_len; 36 size_t value_len;
37}; 37};
diff --git a/include/uapi/linux/reiserfs_xattr.h b/include/uapi/linux/reiserfs_xattr.h
index d8ce17c2459a..38fdd648be21 100644
--- a/include/uapi/linux/reiserfs_xattr.h
+++ b/include/uapi/linux/reiserfs_xattr.h
@@ -16,7 +16,7 @@ struct reiserfs_xattr_header {
16}; 16};
17 17
18struct reiserfs_security_handle { 18struct reiserfs_security_handle {
19 char *name; 19 const char *name;
20 void *value; 20 void *value;
21 size_t length; 21 size_t length;
22}; 22};