Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07060404 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: cleanup xattr code 



Andrew's review of the xattr code revealed some minor issues that this patch
addresses.  Just an error return fix, got rid of a useless statement and
commented one of the trickier parts of __btrfs_getxattr.

Signed-off-by: default avatarJosef Bacik <jbacik@redhat.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent eb1eb04f

fs/btrfs/xattr.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -45,9 +45,12 @@ ssize_t __btrfs_getxattr(struct inode *inode, const char *name, 
	/* lookup the xattr by name */

	/* lookup the xattr by name */

	di = btrfs_lookup_xattr(NULL, root, path, inode->i_ino, name,

	di = btrfs_lookup_xattr(NULL, root, path, inode->i_ino, name,

				strlen(name), 0);

				strlen(name), 0);

	if (!di || IS_ERR(di)) {

	if (!di) {

		ret = -ENODATA;

		ret = -ENODATA;

		goto out;

		goto out;

	} else if (IS_ERR(di)) {

		ret = PTR_ERR(di);

		goto out;

	}

	}





	leaf = path->nodes[0];

	leaf = path->nodes[0];
@@ -62,6 +65,14 @@ ssize_t __btrfs_getxattr(struct inode *inode, const char *name, 
		ret = -ERANGE;

		ret = -ERANGE;

		goto out;

		goto out;

	}

	}



	/*

	 * The way things are packed into the leaf is like this

	 * |struct btrfs_dir_item|name|data|

	 * where name is the xattr name, so security.foo, and data is the

	 * content of the xattr.  data_ptr points to the location in memory

	 * where the data starts in the in memory leaf

	 */

	data_ptr = (unsigned long)((char *)(di + 1) +

	data_ptr = (unsigned long)((char *)(di + 1) +

				   btrfs_dir_name_len(leaf, di));

				   btrfs_dir_name_len(leaf, di));

	read_extent_buffer(leaf, buffer, data_ptr,

	read_extent_buffer(leaf, buffer, data_ptr,
@@ -176,7 +187,6 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size) 
	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);

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

	if (ret < 0)

	if (ret < 0)

		goto err;

		goto err;

	ret = 0;

	advance = 0;

	advance = 0;

	while (1) {

	while (1) {

		leaf = path->nodes[0];

		leaf = path->nodes[0];