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

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

jffs2: constify xattr_handler 



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

fs/jffs2/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static int jffs2_acl_setxattr(struct dentry *dentry, const char *name, 
	return rc;

}



struct xattr_handler jffs2_acl_access_xattr_handler = {

const struct xattr_handler jffs2_acl_access_xattr_handler = {

	.prefix	= POSIX_ACL_XATTR_ACCESS,

	.flags	= ACL_TYPE_DEFAULT,

	.list	= jffs2_acl_access_listxattr,
@@ -427,7 +427,7 @@ struct xattr_handler jffs2_acl_access_xattr_handler = { 
	.set	= jffs2_acl_setxattr,

};



struct xattr_handler jffs2_acl_default_xattr_handler = {

const struct xattr_handler jffs2_acl_default_xattr_handler = {

	.prefix	= POSIX_ACL_XATTR_DEFAULT,

	.flags	= ACL_TYPE_DEFAULT,

	.list	= jffs2_acl_default_listxattr,

fs/jffs2/acl.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ extern int jffs2_acl_chmod(struct inode *); 
extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);

extern int jffs2_init_acl_post(struct inode *);



extern struct xattr_handler jffs2_acl_access_xattr_handler;

extern struct xattr_handler jffs2_acl_default_xattr_handler;

extern const struct xattr_handler jffs2_acl_access_xattr_handler;

extern const struct xattr_handler jffs2_acl_default_xattr_handler;



#else

fs/jffs2/security.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static size_t jffs2_security_listxattr(struct dentry *dentry, char *list, 
	return retlen;

}



struct xattr_handler jffs2_security_xattr_handler = {

const struct xattr_handler jffs2_security_xattr_handler = {

	.prefix = XATTR_SECURITY_PREFIX,

	.list = jffs2_security_listxattr,

	.set = jffs2_security_setxattr,

fs/jffs2/xattr.c

+4 −4
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c, 
 * do_jffs2_setxattr(inode, xprefix, xname, buffer, size, flags)

 *   is an implementation of setxattr handler on jffs2.

 * -------------------------------------------------- */

struct xattr_handler *jffs2_xattr_handlers[] = {

const struct xattr_handler *jffs2_xattr_handlers[] = {

	&jffs2_user_xattr_handler,

#ifdef CONFIG_JFFS2_FS_SECURITY

	&jffs2_security_xattr_handler,
@@ -917,8 +917,8 @@ struct xattr_handler *jffs2_xattr_handlers[] = { 
	NULL

};



static struct xattr_handler *xprefix_to_handler(int xprefix) {

	struct xattr_handler *ret;

static const struct xattr_handler *xprefix_to_handler(int xprefix) {

	const struct xattr_handler *ret;



	switch (xprefix) {

	case JFFS2_XPREFIX_USER:
@@ -955,7 +955,7 @@ ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size) 
	struct jffs2_inode_cache *ic = f->inocache;

	struct jffs2_xattr_ref *ref, **pref;

	struct jffs2_xattr_datum *xd;

	struct xattr_handler *xhandle;

	const struct xattr_handler *xhandle;

	ssize_t len, rc;

	int retry = 0;

fs/jffs2/xattr.h

+4 −4
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ extern int do_jffs2_getxattr(struct inode *inode, int xprefix, const char *xname 
extern int do_jffs2_setxattr(struct inode *inode, int xprefix, const char *xname,

			     const char *buffer, size_t size, int flags);



extern struct xattr_handler *jffs2_xattr_handlers[];

extern struct xattr_handler jffs2_user_xattr_handler;

extern struct xattr_handler jffs2_trusted_xattr_handler;

extern const struct xattr_handler *jffs2_xattr_handlers[];

extern const struct xattr_handler jffs2_user_xattr_handler;

extern const struct xattr_handler jffs2_trusted_xattr_handler;



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

#define jffs2_getxattr		generic_getxattr
@@ -122,7 +122,7 @@ extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t); 


#ifdef CONFIG_JFFS2_FS_SECURITY

extern int jffs2_init_security(struct inode *inode, struct inode *dir);

extern struct xattr_handler jffs2_security_xattr_handler;

extern const struct xattr_handler jffs2_security_xattr_handler;

#else

#define jffs2_init_security(inode,dir)	(0)

#endif /* CONFIG_JFFS2_FS_SECURITY */