Commit 3c44cd3c authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: zoned: return error from btrfs_zone_finish_endio() 



Now that btrfs_zone_finish_endio_workfn() is directly calling
do_zone_finish() the only caller of btrfs_zone_finish_endio() is
btrfs_finish_one_ordered().

btrfs_finish_one_ordered() already has error handling in-place so
btrfs_zone_finish_endio() can return an error if the block group lookup
fails.

Also as btrfs_zone_finish_endio() already checks for zoned filesystems and
returns early, there's no need to do this in the caller.

Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3d16abf6

fs/btrfs/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -3109,9 +3109,10 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) 
		goto out;

	}



	if (btrfs_is_zoned(fs_info))

		btrfs_zone_finish_endio(fs_info, ordered_extent->disk_bytenr,

	ret = btrfs_zone_finish_endio(fs_info, ordered_extent->disk_bytenr,

				      ordered_extent->disk_num_bytes);

	if (ret)

		goto out;



	if (test_bit(BTRFS_ORDERED_TRUNCATED, &ordered_extent->flags)) {

		truncated = true;

fs/btrfs/zoned.c

+5 −3
Original line number Diff line number Diff line
@@ -2458,16 +2458,17 @@ bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, u64 flags) 
	return ret;

}



void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 length)

int btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 length)

{

	struct btrfs_block_group *block_group;

	u64 min_alloc_bytes;



	if (!btrfs_is_zoned(fs_info))

		return;

		return 0;



	block_group = btrfs_lookup_block_group(fs_info, logical);

	ASSERT(block_group);

	if (WARN_ON_ONCE(!block_group))

		return -ENOENT;



	/* No MIXED_BG on zoned btrfs. */

	if (block_group->flags & BTRFS_BLOCK_GROUP_DATA)
@@ -2484,6 +2485,7 @@ void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 len 


out:

	btrfs_put_block_group(block_group);

	return 0;

}



static void btrfs_zone_finish_endio_workfn(struct work_struct *work)

fs/btrfs/zoned.h

+6 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int btrfs_sync_zone_write_pointer(struct btrfs_device *tgt_dev, u64 logical, 
bool btrfs_zone_activate(struct btrfs_block_group *block_group);

int btrfs_zone_finish(struct btrfs_block_group *block_group);

bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, u64 flags);

void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical,

int btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical,

			     u64 length);

void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg,

				   struct extent_buffer *eb);
@@ -234,8 +234,11 @@ static inline bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, 
	return true;

}



static inline void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info,

					   u64 logical, u64 length) { }

static inline int btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info,

					   u64 logical, u64 length)

{

	return 0;

}



static inline void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg,

						 struct extent_buffer *eb) { }