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

Commit 621567a2 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: Remove unused function btrfs_account_dev_extents_size 



This function is not used since the alloc_start parameter has been
obsoleted in commit 0d0c71b3 ("btrfs: obsolete and remove
mount option alloc_start").

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 93b9bcdf

fs/btrfs/volumes.c

+0 −85
Original line number Diff line number Diff line
@@ -1258,91 +1258,6 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, 
	return ret;

}



/* helper to account the used device space in the range */

int btrfs_account_dev_extents_size(struct btrfs_device *device, u64 start,

				   u64 end, u64 *length)

{

	struct btrfs_key key;

	struct btrfs_root *root = device->fs_info->dev_root;

	struct btrfs_dev_extent *dev_extent;

	struct btrfs_path *path;

	u64 extent_end;

	int ret;

	int slot;

	struct extent_buffer *l;



	*length = 0;



	if (start >= device->total_bytes ||

		test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))

		return 0;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	path->reada = READA_FORWARD;



	key.objectid = device->devid;

	key.offset = start;

	key.type = BTRFS_DEV_EXTENT_KEY;



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

	if (ret < 0)

		goto out;

	if (ret > 0) {

		ret = btrfs_previous_item(root, path, key.objectid, key.type);

		if (ret < 0)

			goto out;

	}



	while (1) {

		l = path->nodes[0];

		slot = path->slots[0];

		if (slot >= btrfs_header_nritems(l)) {

			ret = btrfs_next_leaf(root, path);

			if (ret == 0)

				continue;

			if (ret < 0)

				goto out;



			break;

		}

		btrfs_item_key_to_cpu(l, &key, slot);



		if (key.objectid < device->devid)

			goto next;



		if (key.objectid > device->devid)

			break;



		if (key.type != BTRFS_DEV_EXTENT_KEY)

			goto next;



		dev_extent = btrfs_item_ptr(l, slot, struct btrfs_dev_extent);

		extent_end = key.offset + btrfs_dev_extent_length(l,

								  dev_extent);

		if (key.offset <= start && extent_end > end) {

			*length = end - start + 1;

			break;

		} else if (key.offset <= start && extent_end > start)

			*length += extent_end - start;

		else if (key.offset > start && extent_end <= end)

			*length += extent_end - key.offset;

		else if (key.offset > start && key.offset <= end) {

			*length += end - key.offset + 1;

			break;

		} else if (key.offset > end)

			break;



next:

		path->slots[0]++;

	}

	ret = 0;

out:

	btrfs_free_path(path);

	return ret;

}



static int contains_pending_extent(struct btrfs_transaction *transaction,

				   struct btrfs_device *device,

				   u64 *start, u64 len)

fs/btrfs/volumes.h

+0 −2
Original line number Diff line number Diff line
@@ -384,8 +384,6 @@ static inline enum btrfs_map_op btrfs_op(struct bio *bio) 
	}

}



int btrfs_account_dev_extents_size(struct btrfs_device *device, u64 start,

				   u64 end, u64 *length);

void btrfs_get_bbio(struct btrfs_bio *bbio);

void btrfs_put_bbio(struct btrfs_bio *bbio);

int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,