OSDN Git Service

btrfs: relocation: Check cancel request after each extent found
authorQu Wenruo <wqu@suse.com>
Mon, 17 Feb 2020 06:16:54 +0000 (14:16 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 23 Mar 2020 16:01:55 +0000 (17:01 +0100)
When relocating data block groups with tons of small extents, or large
metadata block groups, there can be over 200,000 extents.

We will iterate all extents of such block group in relocate_block_group(),
where iteration itself can be kinda time-consuming.

So when user want to cancel the balance, the extent iteration loop can
be another target.

This patch will add the cancelling check in the extent iteration loop of
relocate_block_group() to make balance cancelling faster.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/relocation.c

index a4edb82..008ba7e 100644 (file)
@@ -4232,6 +4232,10 @@ restart:
                                break;
                        }
                }
+               if (btrfs_should_cancel_balance(fs_info)) {
+                       err = -ECANCELED;
+                       break;
+               }
        }
        if (trans && progress && err == -ENOSPC) {
                ret = btrfs_force_chunk_alloc(trans, rc->block_group->flags);