author: Mateusz Guzik <mguzik@redhat.com> 2016-02-04 02:56:30 +0100
committer: Al Viro <viro@zeniv.linux.org.uk> 2016-02-20 00:15:51 -0500
commit: 0e9a7da51b028aee7a72c95096c99fe5ea2a01f0
parent: 2feb55f89096b22e2de066e411a3263647211987
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 3 deletions
diff --git a/fs/xattr.c b/fs/xattr.c
index 07d0e47f6a7f..4861322e28e8 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -940,7 +940,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
bool trusted = capable(CAP_SYS_ADMIN);
struct simple_xattr *xattr;
ssize_t remaining_size = size;
- int err;
+ int err = 0;
#ifdef CONFIG_FS_POSIX_ACL
if (inode->i_acl) {
@@ -965,11 +965,11 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
err = xattr_list_one(&buffer, &remaining_size, xattr->name);
if (err)
- return err;
+ break;
}
spin_unlock(&xattrs->lock);
- return size - remaining_size;
+ return err ? err : size - remaining_size;
}
/*