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

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

xfs: constify xattr_handler 



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

fs/xfs/linux-2.6/xfs_acl.c

+2 −2
Original line number Diff line number Diff line
@@ -440,14 +440,14 @@ xfs_xattr_acl_set(struct dentry *dentry, const char *name, 
	return error;

}



struct xattr_handler xfs_xattr_acl_access_handler = {

const struct xattr_handler xfs_xattr_acl_access_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.flags	= ACL_TYPE_ACCESS,

	.get	= xfs_xattr_acl_get,

	.set	= xfs_xattr_acl_set,

};



struct xattr_handler xfs_xattr_acl_default_handler = {

const struct xattr_handler xfs_xattr_acl_default_handler = {

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.get	= xfs_xattr_acl_get,

fs/xfs/linux-2.6/xfs_super.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ extern __uint64_t xfs_max_file_offset(unsigned int); 
extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);



extern const struct export_operations xfs_export_operations;

extern struct xattr_handler *xfs_xattr_handlers[];

extern const struct xattr_handler *xfs_xattr_handlers[];

extern const struct quotactl_ops xfs_quotactl_operations;



#define XFS_M(sb)		((struct xfs_mount *)((sb)->s_fs_info))

fs/xfs/linux-2.6/xfs_xattr.c

+4 −4
Original line number Diff line number Diff line
@@ -72,28 +72,28 @@ xfs_xattr_set(struct dentry *dentry, const char *name, const void *value, 
				(void *)value, size, xflags);

}



static struct xattr_handler xfs_xattr_user_handler = {

static const struct xattr_handler xfs_xattr_user_handler = {

	.prefix	= XATTR_USER_PREFIX,

	.flags	= 0, /* no flags implies user namespace */

	.get	= xfs_xattr_get,

	.set	= xfs_xattr_set,

};



static struct xattr_handler xfs_xattr_trusted_handler = {

static const struct xattr_handler xfs_xattr_trusted_handler = {

	.prefix	= XATTR_TRUSTED_PREFIX,

	.flags	= ATTR_ROOT,

	.get	= xfs_xattr_get,

	.set	= xfs_xattr_set,

};



static struct xattr_handler xfs_xattr_security_handler = {

static const struct xattr_handler xfs_xattr_security_handler = {

	.prefix	= XATTR_SECURITY_PREFIX,

	.flags	= ATTR_SECURE,

	.get	= xfs_xattr_get,

	.set	= xfs_xattr_set,

};



struct xattr_handler *xfs_xattr_handlers[] = {

const struct xattr_handler *xfs_xattr_handlers[] = {

	&xfs_xattr_user_handler,

	&xfs_xattr_trusted_handler,

	&xfs_xattr_security_handler,

fs/xfs/xfs_acl.h

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ extern int xfs_acl_chmod(struct inode *inode); 
extern int posix_acl_access_exists(struct inode *inode);

extern int posix_acl_default_exists(struct inode *inode);



extern struct xattr_handler xfs_xattr_acl_access_handler;

extern struct xattr_handler xfs_xattr_acl_default_handler;

extern const struct xattr_handler xfs_xattr_acl_access_handler;

extern const struct xattr_handler xfs_xattr_acl_default_handler;

#else

# define xfs_check_acl					NULL

# define xfs_get_acl(inode, type)			NULL