Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ext2: constify xattr_handler 



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

fs/ext2/acl.c

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

}



struct xattr_handler ext2_xattr_acl_access_handler = {

const struct xattr_handler ext2_xattr_acl_access_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.flags	= ACL_TYPE_ACCESS,

	.list	= ext2_xattr_list_acl_access,
@@ -428,7 +428,7 @@ struct xattr_handler ext2_xattr_acl_access_handler = { 
	.set	= ext2_xattr_set_acl,

};



struct xattr_handler ext2_xattr_acl_default_handler = {

const struct xattr_handler ext2_xattr_acl_default_handler = {

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.list	= ext2_xattr_list_acl_default,

fs/ext2/xattr.c

+5 −5
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void ext2_xattr_rehash(struct ext2_xattr_header *, 


static struct mb_cache *ext2_xattr_cache;



static struct xattr_handler *ext2_xattr_handler_map[] = {

static const struct xattr_handler *ext2_xattr_handler_map[] = {

	[EXT2_XATTR_INDEX_USER]		     = &ext2_xattr_user_handler,

#ifdef CONFIG_EXT2_FS_POSIX_ACL

	[EXT2_XATTR_INDEX_POSIX_ACL_ACCESS]  = &ext2_xattr_acl_access_handler,
@@ -113,7 +113,7 @@ static struct xattr_handler *ext2_xattr_handler_map[] = { 
#endif

};



struct xattr_handler *ext2_xattr_handlers[] = {

const struct xattr_handler *ext2_xattr_handlers[] = {

	&ext2_xattr_user_handler,

	&ext2_xattr_trusted_handler,

#ifdef CONFIG_EXT2_FS_POSIX_ACL
@@ -126,10 +126,10 @@ struct xattr_handler *ext2_xattr_handlers[] = { 
	NULL

};



static inline struct xattr_handler *

static inline const struct xattr_handler *

ext2_xattr_handler(int name_index)

{

	struct xattr_handler *handler = NULL;

	const struct xattr_handler *handler = NULL;



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

		handler = ext2_xattr_handler_map[name_index];
@@ -298,7 +298,7 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list", 
	/* list the attribute names */

	for (entry = FIRST_ENTRY(bh); !IS_LAST_ENTRY(entry);

	     entry = EXT2_XATTR_NEXT(entry)) {

		struct xattr_handler *handler =

		const struct xattr_handler *handler =

			ext2_xattr_handler(entry->e_name_index);



		if (handler) {

fs/ext2/xattr.h

+6 −6
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ struct ext2_xattr_entry { 


# ifdef CONFIG_EXT2_FS_XATTR



extern struct xattr_handler ext2_xattr_user_handler;

extern struct xattr_handler ext2_xattr_trusted_handler;

extern struct xattr_handler ext2_xattr_acl_access_handler;

extern struct xattr_handler ext2_xattr_acl_default_handler;

extern struct xattr_handler ext2_xattr_security_handler;

extern const struct xattr_handler ext2_xattr_user_handler;

extern const struct xattr_handler ext2_xattr_trusted_handler;

extern const struct xattr_handler ext2_xattr_acl_access_handler;

extern const struct xattr_handler ext2_xattr_acl_default_handler;

extern const struct xattr_handler ext2_xattr_security_handler;



extern ssize_t ext2_listxattr(struct dentry *, char *, size_t);
@@ -72,7 +72,7 @@ extern void ext2_xattr_put_super(struct super_block *); 
extern int init_ext2_xattr(void);

extern void exit_ext2_xattr(void);



extern struct xattr_handler *ext2_xattr_handlers[];

extern const struct xattr_handler *ext2_xattr_handlers[];



# else  /* CONFIG_EXT2_FS_XATTR */

fs/ext2/xattr_security.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ ext2_init_security(struct inode *inode, struct inode *dir) 
	return err;

}



struct xattr_handler ext2_xattr_security_handler = {

const struct xattr_handler ext2_xattr_security_handler = {

	.prefix	= XATTR_SECURITY_PREFIX,

	.list	= ext2_xattr_security_list,

	.get	= ext2_xattr_security_get,

fs/ext2/xattr_trusted.c

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

}



struct xattr_handler ext2_xattr_trusted_handler = {

const struct xattr_handler ext2_xattr_trusted_handler = {

	.prefix	= XATTR_TRUSTED_PREFIX,

	.list	= ext2_xattr_trusted_list,

	.get	= ext2_xattr_trusted_get,