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

ext4: constify xattr_handler 



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

fs/ext4/acl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -454,7 +454,7 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, 
	return error;

	return error;

}

}





struct xattr_handler ext4_xattr_acl_access_handler = {

const struct xattr_handler ext4_xattr_acl_access_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.flags	= ACL_TYPE_ACCESS,

	.flags	= ACL_TYPE_ACCESS,

	.list	= ext4_xattr_list_acl_access,

	.list	= ext4_xattr_list_acl_access,
@@ -462,7 +462,7 @@ struct xattr_handler ext4_xattr_acl_access_handler = { 
	.set	= ext4_xattr_set_acl,

	.set	= ext4_xattr_set_acl,

};

};





struct xattr_handler ext4_xattr_acl_default_handler = {

const struct xattr_handler ext4_xattr_acl_default_handler = {

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.list	= ext4_xattr_list_acl_default,

	.list	= ext4_xattr_list_acl_default,

fs/ext4/xattr.c

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




static struct mb_cache *ext4_xattr_cache;

static struct mb_cache *ext4_xattr_cache;





static struct xattr_handler *ext4_xattr_handler_map[] = {

static const struct xattr_handler *ext4_xattr_handler_map[] = {

	[EXT4_XATTR_INDEX_USER]		     = &ext4_xattr_user_handler,

	[EXT4_XATTR_INDEX_USER]		     = &ext4_xattr_user_handler,

#ifdef CONFIG_EXT4_FS_POSIX_ACL

#ifdef CONFIG_EXT4_FS_POSIX_ACL

	[EXT4_XATTR_INDEX_POSIX_ACL_ACCESS]  = &ext4_xattr_acl_access_handler,

	[EXT4_XATTR_INDEX_POSIX_ACL_ACCESS]  = &ext4_xattr_acl_access_handler,
@@ -109,7 +109,7 @@ static struct xattr_handler *ext4_xattr_handler_map[] = { 
#endif

#endif

};

};





struct xattr_handler *ext4_xattr_handlers[] = {

const struct xattr_handler *ext4_xattr_handlers[] = {

	&ext4_xattr_user_handler,

	&ext4_xattr_user_handler,

	&ext4_xattr_trusted_handler,

	&ext4_xattr_trusted_handler,

#ifdef CONFIG_EXT4_FS_POSIX_ACL

#ifdef CONFIG_EXT4_FS_POSIX_ACL
@@ -122,10 +122,10 @@ struct xattr_handler *ext4_xattr_handlers[] = { 
	NULL

	NULL

};

};





static inline struct xattr_handler *

static inline const struct xattr_handler *

ext4_xattr_handler(int name_index)

ext4_xattr_handler(int name_index)

{

{

	struct xattr_handler *handler = NULL;

	const struct xattr_handler *handler = NULL;





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

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

		handler = ext4_xattr_handler_map[name_index];

		handler = ext4_xattr_handler_map[name_index];
@@ -332,7 +332,7 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry, 
	size_t rest = buffer_size;

	size_t rest = buffer_size;





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

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

		struct xattr_handler *handler =

		const struct xattr_handler *handler =

			ext4_xattr_handler(entry->e_name_index);

			ext4_xattr_handler(entry->e_name_index);





		if (handler) {

		if (handler) {

fs/ext4/xattr.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -65,11 +65,11 @@ struct ext4_xattr_entry { 




# ifdef CONFIG_EXT4_FS_XATTR

# ifdef CONFIG_EXT4_FS_XATTR





extern struct xattr_handler ext4_xattr_user_handler;

extern const struct xattr_handler ext4_xattr_user_handler;

extern struct xattr_handler ext4_xattr_trusted_handler;

extern const struct xattr_handler ext4_xattr_trusted_handler;

extern struct xattr_handler ext4_xattr_acl_access_handler;

extern const struct xattr_handler ext4_xattr_acl_access_handler;

extern struct xattr_handler ext4_xattr_acl_default_handler;

extern const struct xattr_handler ext4_xattr_acl_default_handler;

extern struct xattr_handler ext4_xattr_security_handler;

extern const struct xattr_handler ext4_xattr_security_handler;





extern ssize_t ext4_listxattr(struct dentry *, char *, size_t);

extern ssize_t ext4_listxattr(struct dentry *, char *, size_t);
@@ -86,7 +86,7 @@ extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, 
extern int init_ext4_xattr(void);

extern int init_ext4_xattr(void);

extern void exit_ext4_xattr(void);

extern void exit_ext4_xattr(void);





extern struct xattr_handler *ext4_xattr_handlers[];

extern const struct xattr_handler *ext4_xattr_handlers[];





# else  /* CONFIG_EXT4_FS_XATTR */

# else  /* CONFIG_EXT4_FS_XATTR */

fs/ext4/xattr_security.c

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

	return err;

}

}





struct xattr_handler ext4_xattr_security_handler = {

const struct xattr_handler ext4_xattr_security_handler = {

	.prefix	= XATTR_SECURITY_PREFIX,

	.prefix	= XATTR_SECURITY_PREFIX,

	.list	= ext4_xattr_security_list,

	.list	= ext4_xattr_security_list,

	.get	= ext4_xattr_security_get,

	.get	= ext4_xattr_security_get,

fs/ext4/xattr_trusted.c

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

			      name, value, size, flags);

}

}





struct xattr_handler ext4_xattr_trusted_handler = {

const struct xattr_handler ext4_xattr_trusted_handler = {

	.prefix	= XATTR_TRUSTED_PREFIX,

	.prefix	= XATTR_TRUSTED_PREFIX,

	.list	= ext4_xattr_trusted_list,

	.list	= ext4_xattr_trusted_list,

	.get	= ext4_xattr_trusted_get,

	.get	= ext4_xattr_trusted_get,