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

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 <>
Reviewed-by: default avatarRichard Weinberger <>
Cc: Artem Bityutskiy <>
Cc: Adrian Hunter <>
Cc: Subodh Nijsure <>
Signed-off-by: default avatarAl Viro <>
parent dae5f57a
......@@ -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;
err = mount_ubifs(c);
......@@ -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;
......@@ -582,46 +582,6 @@ out_free:
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 = {
.list = security_listxattr,
.get = security_getxattr,
.set = security_setxattr,
const struct xattr_handler *ubifs_xattr_handlers[] = {
static int init_xattrs(struct inode *inode, const struct xattr *xattr_array,
void *fs_info)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment