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

Commit 13d3408f authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Al Viro
Browse files

ubifs: Remove unused security xattr handler 



Ubifs installs a security xattr handler in sb->s_xattr but doesn't use the
generic_{get,set,list,remove}xattr inode operations needed for processing
this list of attribute handlers; the handler is never called.  Instead,
ubifs uses its own xattr handlers which also process security xattrs.

Remove the dead code.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: linux-mtd@lists.infradead.org
Cc: Subodh Nijsure <snijsure@grid-net.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent dae5f57a

fs/ubifs/super.c

+0 −1
Original line number Diff line number Diff line
@@ -2037,7 +2037,6 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) 
	if (c->max_inode_sz > MAX_LFS_FILESIZE)

		sb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE;

	sb->s_op = &ubifs_super_operations;

	sb->s_xattr = ubifs_xattr_handlers;



	mutex_lock(&c->umount_mutex);

	err = mount_ubifs(c);

fs/ubifs/ubifs.h

+0 −1
Original line number Diff line number Diff line
@@ -1470,7 +1470,6 @@ extern spinlock_t ubifs_infos_lock; 
extern atomic_long_t ubifs_clean_zn_cnt;

extern struct kmem_cache *ubifs_inode_slab;

extern const struct super_operations ubifs_super_operations;

extern const struct xattr_handler *ubifs_xattr_handlers[];

extern const struct address_space_operations ubifs_file_address_operations;

extern const struct file_operations ubifs_file_operations;

extern const struct inode_operations ubifs_file_inode_operations;

fs/ubifs/xattr.c

+0 −40
Original line number Diff line number Diff line
@@ -582,46 +582,6 @@ int ubifs_removexattr(struct dentry *dentry, const char *name) 
	return err;

}



static size_t security_listxattr(struct dentry *d, char *list, size_t list_size,

				 const char *name, size_t name_len, int flags)

{

	const int prefix_len = XATTR_SECURITY_PREFIX_LEN;

	const size_t total_len = prefix_len + name_len + 1;



	if (list && total_len <= list_size) {

		memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);

		memcpy(list + prefix_len, name, name_len);

		list[prefix_len + name_len] = '\0';

	}



	return total_len;

}



static int security_getxattr(struct dentry *d, const char *name, void *buffer,

		      size_t size, int flags)

{

	return ubifs_getxattr(d, name, buffer, size);

}



static int security_setxattr(struct dentry *d, const char *name,

			     const void *value, size_t size, int flags,

			     int handler_flags)

{

	return ubifs_setxattr(d, name, value, size, flags);

}



static const struct xattr_handler ubifs_xattr_security_handler = {

	.prefix = XATTR_SECURITY_PREFIX,

	.list   = security_listxattr,

	.get    = security_getxattr,

	.set    = security_setxattr,

};



const struct xattr_handler *ubifs_xattr_handlers[] = {

	&ubifs_xattr_security_handler,

	NULL,

};



static int init_xattrs(struct inode *inode, const struct xattr *xattr_array,

		      void *fs_info)

{