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

Commit ba7ea1d8 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: merge ext4_xattr_list() into ext4_listxattr() 



There's no difference between ext4_xattr_list() and ext4_listxattr(), so
merge them together and just have ext4_listxattr().  Some years ago they
took different arguments, but that's no longer the case.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent d6006186

fs/ext4/xattr.c

+5 −16
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ static struct buffer_head *ext4_xattr_cache_find(struct inode *, 
						 struct mb_cache_entry **);

static void ext4_xattr_rehash(struct ext4_xattr_header *,

			      struct ext4_xattr_entry *);

static int ext4_xattr_list(struct dentry *dentry, char *buffer,

			   size_t buffer_size);



static const struct xattr_handler * const ext4_xattr_handler_map[] = {

	[EXT4_XATTR_INDEX_USER]		     = &ext4_xattr_user_handler,
@@ -163,17 +161,6 @@ ext4_xattr_handler(int name_index) 
	return handler;

}



/*

 * Inode operation listxattr()

 *

 * d_inode(dentry)->i_mutex: don't care

 */

ssize_t

ext4_listxattr(struct dentry *dentry, char *buffer, size_t size)

{

	return ext4_xattr_list(dentry, buffer, size);

}



static int

ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,

		       void *value_start)
@@ -519,7 +506,9 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
}



/*

 * ext4_xattr_list()

 * Inode operation listxattr()

 *

 * d_inode(dentry)->i_rwsem: don't care

 *

 * Copy a list of attribute names into the buffer

 * provided, or compute the buffer size required.
@@ -528,8 +517,8 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
 * Returns a negative error number on failure, or the number of bytes

 * used / required on success.

 */

static int

ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)

ssize_t

ext4_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)

{

	int ret, ret2;