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

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

fs/ext4/xattr.c

+13 −13
Original line number Diff line number Diff line
@@ -427,23 +427,23 @@ ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size) 
static int

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);

	i_error = ext4_xattr_ibody_list(dentry, buffer, buffer_size);

	if (i_error < 0) {

		b_error = 0;

	} else {

	ret = ret2 = ext4_xattr_ibody_list(dentry, buffer, buffer_size);

	if (ret < 0)

		goto errout;

	if (buffer) {

			buffer += i_error;

			buffer_size -= i_error;

		}

		b_error = ext4_xattr_block_list(dentry, buffer, buffer_size);

		if (b_error < 0)

			i_error = 0;

	}

		buffer += ret;

		buffer_size -= ret;

	}

	ret = ext4_xattr_block_list(dentry, buffer, buffer_size);

	if (ret < 0)

		goto errout;

	ret += ret2;

errout:

	up_read(&EXT4_I(dentry->d_inode)->xattr_sem);

	return i_error + b_error;

	return ret;

}



/*