Commit bb435453 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Al Viro
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 18e9e510

fs/generic_acl.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

fs/xattr.c

+7 −7
Original line number Diff line number Diff line
@@ -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)

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/generic_acl.h

+2 −2
Original line number Diff line number Diff line
@@ -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 *);

include/linux/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -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);