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

Commit 825ad4c9 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop redundant parameters from btrfs_map_sblock 



All callers pass 0 for mirror_num and 1 for need_raid_map.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bcc8e07f

fs/btrfs/scrub.c

+3 −3
Original line number Diff line number Diff line
@@ -1331,7 +1331,7 @@ static int scrub_setup_recheck_block(struct scrub_block *original_sblock, 
		 * represents one mirror

		 */

		ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS,

				logical, &mapped_length, &bbio, 0, 1);

				logical, &mapped_length, &bbio);

		if (ret || !bbio || mapped_length < sublen) {

			btrfs_put_bbio(bbio);

			return -EIO;
@@ -2192,7 +2192,7 @@ static void scrub_missing_raid56_pages(struct scrub_block *sblock) 
	int i;



	ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,

			&length, &bbio, 0, 1);

			&length, &bbio);

	if (ret || !bbio || !bbio->raid_map)

		goto bbio_out;
@@ -2780,7 +2780,7 @@ static void scrub_parity_check_and_repair(struct scrub_parity *sparity) 


	length = sparity->logic_end - sparity->logic_start;

	ret = btrfs_map_sblock(fs_info, BTRFS_MAP_WRITE, sparity->logic_start,

			       &length, &bbio, 0, 1);

			       &length, &bbio);

	if (ret || !bbio || !bbio->raid_map)

		goto bbio_out;

fs/btrfs/volumes.c

+2 −4
Original line number Diff line number Diff line
@@ -5952,11 +5952,9 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
/* For Scrub/replace */

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 mirror_num,

		     int need_raid_map)

		     struct btrfs_bio **bbio_ret)

{

	return __btrfs_map_block(fs_info, op, logical, length, bbio_ret,

				 mirror_num, need_raid_map);

	return __btrfs_map_block(fs_info, op, logical, length, bbio_ret, 0, 1);

}



int btrfs_rmap_block(struct btrfs_fs_info *fs_info,

fs/btrfs/volumes.h

+1 −2
Original line number Diff line number Diff line
@@ -400,8 +400,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
		    struct btrfs_bio **bbio_ret, int mirror_num);

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 mirror_num,

		     int need_raid_map);

		     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);