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

Commit 63a9c7b9 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove devid parameter from btrfs_rmap_block 



This function is used in only one place and devid argument is always
passed 0. So just remove it, similarly to how it was removed in the
userspace code.

Signed-off-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 8b317901

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int exclude_super_stripes(struct btrfs_fs_info *fs_info, 
	for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {

		bytenr = btrfs_sb_offset(i);

		ret = btrfs_rmap_block(fs_info, cache->key.objectid,

				       bytenr, 0, &logical, &nr, &stripe_len);

				       bytenr, &logical, &nr, &stripe_len);

		if (ret)

			return ret;

fs/btrfs/volumes.c

+2 −5
Original line number Diff line number Diff line
@@ -5975,9 +5975,8 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
	return __btrfs_map_block(fs_info, op, logical, length, bbio_ret, 0, 1);

}



int btrfs_rmap_block(struct btrfs_fs_info *fs_info,

		     u64 chunk_start, u64 physical, u64 devid,

		     u64 **logical, int *naddrs, int *stripe_len)

int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,

		     u64 physical, u64 **logical, int *naddrs, int *stripe_len)

{

	struct extent_map *em;

	struct map_lookup *map;
@@ -6009,8 +6008,6 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, 
	BUG_ON(!buf); /* -ENOMEM */



	for (i = 0; i < map->num_stripes; i++) {

		if (devid && map->stripes[i].dev->devid != devid)

			continue;

		if (map->stripes[i].physical > physical ||

		    map->stripes[i].physical + length <= physical)

			continue;

fs/btrfs/volumes.h

+2 −3
Original line number Diff line number Diff line
@@ -394,9 +394,8 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,

		     u64 logical, u64 *length,

		     struct btrfs_bio **bbio_ret);

int btrfs_rmap_block(struct btrfs_fs_info *fs_info,

		     u64 chunk_start, u64 physical, u64 devid,

		     u64 **logical, int *naddrs, int *stripe_len);

int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,

		     u64 physical, u64 **logical, int *naddrs, int *stripe_len);

int btrfs_read_sys_array(struct btrfs_fs_info *fs_info);

int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info);

int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,