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

ext3: constify xattr handlers 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 749c72ef

fs/ext3/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ release_and_out: 
	return error;

}



struct xattr_handler ext3_xattr_acl_access_handler = {

const struct xattr_handler ext3_xattr_acl_access_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.flags	= ACL_TYPE_ACCESS,

	.list	= ext3_xattr_list_acl_access,
@@ -464,7 +464,7 @@ struct xattr_handler ext3_xattr_acl_access_handler = { 
	.set	= ext3_xattr_set_acl,

};



struct xattr_handler ext3_xattr_acl_default_handler = {

const struct xattr_handler ext3_xattr_acl_default_handler = {

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.list	= ext3_xattr_list_acl_default,

fs/ext3/xattr.c

+5 −5
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int ext3_xattr_list(struct dentry *dentry, char *buffer, 


static struct mb_cache *ext3_xattr_cache;



static struct xattr_handler *ext3_xattr_handler_map[] = {

static const struct xattr_handler *ext3_xattr_handler_map[] = {

	[EXT3_XATTR_INDEX_USER]		     = &ext3_xattr_user_handler,

#ifdef CONFIG_EXT3_FS_POSIX_ACL

	[EXT3_XATTR_INDEX_POSIX_ACL_ACCESS]  = &ext3_xattr_acl_access_handler,
@@ -116,7 +116,7 @@ static struct xattr_handler *ext3_xattr_handler_map[] = { 
#endif

};



struct xattr_handler *ext3_xattr_handlers[] = {

const struct xattr_handler *ext3_xattr_handlers[] = {

	&ext3_xattr_user_handler,

	&ext3_xattr_trusted_handler,

#ifdef CONFIG_EXT3_FS_POSIX_ACL
@@ -129,10 +129,10 @@ struct xattr_handler *ext3_xattr_handlers[] = { 
	NULL

};



static inline struct xattr_handler *

static inline const struct xattr_handler *

ext3_xattr_handler(int name_index)

{

	struct xattr_handler *handler = NULL;

	const struct xattr_handler *handler = NULL;



	if (name_index > 0 && name_index < ARRAY_SIZE(ext3_xattr_handler_map))

		handler = ext3_xattr_handler_map[name_index];
@@ -338,7 +338,7 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry, 
	size_t rest = buffer_size;



	for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {

		struct xattr_handler *handler =

		const struct xattr_handler *handler =

			ext3_xattr_handler(entry->e_name_index);



		if (handler) {

fs/ext3/xattr.h

+6 −6
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ struct ext3_xattr_entry { 


# ifdef CONFIG_EXT3_FS_XATTR



extern struct xattr_handler ext3_xattr_user_handler;

extern struct xattr_handler ext3_xattr_trusted_handler;

extern struct xattr_handler ext3_xattr_acl_access_handler;

extern struct xattr_handler ext3_xattr_acl_default_handler;

extern struct xattr_handler ext3_xattr_security_handler;

extern const struct xattr_handler ext3_xattr_user_handler;

extern const struct xattr_handler ext3_xattr_trusted_handler;

extern const struct xattr_handler ext3_xattr_acl_access_handler;

extern const struct xattr_handler ext3_xattr_acl_default_handler;

extern const struct xattr_handler ext3_xattr_security_handler;



extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);
@@ -76,7 +76,7 @@ extern void ext3_xattr_put_super(struct super_block *); 
extern int init_ext3_xattr(void);

extern void exit_ext3_xattr(void);



extern struct xattr_handler *ext3_xattr_handlers[];

extern const struct xattr_handler *ext3_xattr_handlers[];



# else  /* CONFIG_EXT3_FS_XATTR */

fs/ext3/xattr_security.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ ext3_init_security(handle_t *handle, struct inode *inode, struct inode *dir) 
	return err;

}



struct xattr_handler ext3_xattr_security_handler = {

const struct xattr_handler ext3_xattr_security_handler = {

	.prefix	= XATTR_SECURITY_PREFIX,

	.list	= ext3_xattr_security_list,

	.get	= ext3_xattr_security_get,

fs/ext3/xattr_trusted.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ ext3_xattr_trusted_set(struct dentry *dentry, const char *name, 
			      value, size, flags);

}



struct xattr_handler ext3_xattr_trusted_handler = {

const struct xattr_handler ext3_xattr_trusted_handler = {

	.prefix	= XATTR_TRUSTED_PREFIX,

	.list	= ext3_xattr_trusted_list,

	.get	= ext3_xattr_trusted_get,