Commit 184b3d19 authored by Gabriel Niebler's avatar Gabriel Niebler Committed by David Sterba
Browse files

btrfs: use btrfs_for_each_slot in btrfs_listxattr 



This function can be simplified by refactoring to use the new iterator
macro.  No functional changes.

Signed-off-by: default avatarMarcos Paulo de Souza <mpdesouza@suse.com>
Signed-off-by: default avatarGabriel Niebler <gniebler@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 43cb1478

fs/btrfs/xattr.c

+11 −29
Original line number Diff line number Diff line
@@ -272,10 +272,12 @@ int btrfs_setxattr_trans(struct inode *inode, const char *name, 


ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)

{

	struct btrfs_key found_key;

	struct btrfs_key key;

	struct inode *inode = d_inode(dentry);

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_path *path;

	int iter_ret = 0;

	int ret = 0;

	size_t total_size = 0, size_left = size;
@@ -294,44 +296,23 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size) 
	path->reada = READA_FORWARD;



	/* search for our xattrs */

	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);

	if (ret < 0)

		goto err;



	while (1) {

	btrfs_for_each_slot(root, &key, &found_key, path, iter_ret) {

		struct extent_buffer *leaf;

		int slot;

		struct btrfs_dir_item *di;

		struct btrfs_key found_key;

		u32 item_size;

		u32 cur;



		leaf = path->nodes[0];

		slot = path->slots[0];



		/* this is where we start walking through the path */

		if (slot >= btrfs_header_nritems(leaf)) {

			/*

			 * if we've reached the last slot in this leaf we need

			 * to go to the next leaf and reset everything

			 */

			ret = btrfs_next_leaf(root, path);

			if (ret < 0)

				goto err;

			else if (ret > 0)

				break;

			continue;

		}



		btrfs_item_key_to_cpu(leaf, &found_key, slot);



		/* check to make sure this item is what we want */

		if (found_key.objectid != key.objectid)

			break;

		if (found_key.type > BTRFS_XATTR_ITEM_KEY)

			break;

		if (found_key.type < BTRFS_XATTR_ITEM_KEY)

			goto next_item;

			continue;



		di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item);

		item_size = btrfs_item_size(leaf, slot);
@@ -351,8 +332,8 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size) 
				goto next;



			if (!buffer || (name_len + 1) > size_left) {

				ret = -ERANGE;

				goto err;

			        iter_ret = -ERANGE;

				break;

			}



			read_extent_buffer(leaf, buffer, name_ptr, name_len);
@@ -364,12 +345,13 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size) 
			cur += this_len;

			di = (struct btrfs_dir_item *)((char *)di + this_len);

		}

next_item:

		path->slots[0]++;

	}



	if (iter_ret < 0)

		ret = iter_ret;

	else

		ret = total_size;



err:

	btrfs_free_path(path);



	return ret;