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

Commit 5fbf83c1 authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik
Browse files

Btrfs: delete unused parameter to btrfs_read_root_item() 



Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent ecc7ada7

fs/btrfs/ctree.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -3359,8 +3359,7 @@ int __must_check btrfs_update_root(struct btrfs_trans_handle *trans, 
				   struct btrfs_root *root,

				   struct btrfs_root *root,

				   struct btrfs_key *key,

				   struct btrfs_key *key,

				   struct btrfs_root_item *item);

				   struct btrfs_root_item *item);

void btrfs_read_root_item(struct btrfs_root *root,

void btrfs_read_root_item(struct extent_buffer *eb, int slot,

			 struct extent_buffer *eb, int slot,

			  struct btrfs_root_item *item);

			  struct btrfs_root_item *item);

int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct

int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct

			 btrfs_root_item *item, struct btrfs_key *key);

			 btrfs_root_item *item, struct btrfs_key *key);

fs/btrfs/disk-io.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1481,7 +1481,7 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, 
	if (ret == 0) {

	if (ret == 0) {

		l = path->nodes[0];

		l = path->nodes[0];

		slot = path->slots[0];

		slot = path->slots[0];

		btrfs_read_root_item(tree_root, l, slot, &root->root_item);

		btrfs_read_root_item(l, slot, &root->root_item);

		memcpy(&root->root_key, location, sizeof(*location));

		memcpy(&root->root_key, location, sizeof(*location));

	}

	}

	btrfs_free_path(path);

	btrfs_free_path(path);

fs/btrfs/root-tree.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -29,8 +29,7 @@ 
 * generation numbers as then we know the root was once mounted with an older

 * generation numbers as then we know the root was once mounted with an older

 * kernel that was not aware of the root item structure change.

 * kernel that was not aware of the root item structure change.

 */

 */

void btrfs_read_root_item(struct btrfs_root *root,

void btrfs_read_root_item(struct extent_buffer *eb, int slot,

			 struct extent_buffer *eb, int slot,

			  struct btrfs_root_item *item)

			  struct btrfs_root_item *item)

{

{

	uuid_le uuid;

	uuid_le uuid;
@@ -104,7 +103,7 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, 
		goto out;

		goto out;

	}

	}

	if (item)

	if (item)

		btrfs_read_root_item(root, l, slot, item);

		btrfs_read_root_item(l, slot, item);

	if (key)

	if (key)

		memcpy(key, &found_key, sizeof(found_key));

		memcpy(key, &found_key, sizeof(found_key));