Commit eaeef867 authored by Theodore Ts'o's avatar Theodore Ts'o

ext4: clean up ext4_xattr_list()'s error code checking and return strategy

Any time you see code that tries to add error codes together, you
should want to claw your eyes out...
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 93259636
...@@ -427,23 +427,23 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) ...@@ -427,23 +427,23 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)
static int static int
ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
{ {
int i_error, b_error; int ret, ret2;
down_read(&EXT4_I(dentry->d_inode)->xattr_sem); down_read(&EXT4_I(dentry->d_inode)->xattr_sem);
i_error = ext4_xattr_ibody_list(dentry, buffer, buffer_size); ret = ret2 = ext4_xattr_ibody_list(dentry, buffer, buffer_size);
if (i_error < 0) { if (ret < 0)
b_error = 0; goto errout;
} else {
if (buffer) { if (buffer) {
buffer += i_error; buffer += ret;
buffer_size -= i_error; buffer_size -= ret;
} }
b_error = ext4_xattr_block_list(dentry, buffer, buffer_size); ret = ext4_xattr_block_list(dentry, buffer, buffer_size);
if (b_error < 0) if (ret < 0)
i_error = 0; goto errout;
} ret += ret2;
errout:
up_read(&EXT4_I(dentry->d_inode)->xattr_sem); up_read(&EXT4_I(dentry->d_inode)->xattr_sem);
return i_error + b_error; return ret;
} }
/* /*
......
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