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

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
...@@ -78,8 +78,6 @@ static struct buffer_head *ext4_xattr_cache_find(struct inode *, ...@@ -78,8 +78,6 @@ static struct buffer_head *ext4_xattr_cache_find(struct inode *,
struct mb_cache_entry **); struct mb_cache_entry **);
static void ext4_xattr_rehash(struct ext4_xattr_header *, static void ext4_xattr_rehash(struct ext4_xattr_header *,
struct ext4_xattr_entry *); 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[] = { static const struct xattr_handler * const ext4_xattr_handler_map[] = {
[EXT4_XATTR_INDEX_USER] = &ext4_xattr_user_handler, [EXT4_XATTR_INDEX_USER] = &ext4_xattr_user_handler,
...@@ -163,17 +161,6 @@ ext4_xattr_handler(int name_index) ...@@ -163,17 +161,6 @@ ext4_xattr_handler(int name_index)
return handler; 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 static int
ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end, ext4_xattr_check_names(struct ext4_xattr_entry *entry, void *end,
void *value_start) void *value_start)
...@@ -519,7 +506,9 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) ...@@ -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 * Copy a list of attribute names into the buffer
* provided, or compute the buffer size required. * provided, or compute the buffer size required.
...@@ -528,8 +517,8 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) ...@@ -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 * Returns a negative error number on failure, or the number of bytes
* used / required on success. * used / required on success.
*/ */
static int ssize_t
ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) ext4_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
{ {
int ret, ret2; int ret, ret2;
......
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