diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2024-12-20 10:25:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-12-20 10:25:44 +0100 |
| commit | 60675d4ca1ef0857e44eba5849b74a3a998d0c0f (patch) | |
| tree | b2fa39712aeca80db32be43f3f5be8e5a58bc0a3 /fs/btrfs/dev-replace.c | |
| parent | x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() (diff) | |
| parent | Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.tar.xz wireguard-linux-60675d4ca1ef0857e44eba5849b74a3a998d0c0f.zip | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 83d5cdd77f29..ac8e97ed13f7 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -45,7 +45,7 @@ * * - Copy existing extents * - * This happens by re-using scrub facility, as scrub also iterates through + * This happens by reusing scrub facility, as scrub also iterates through * existing extents from commit root. * * Location: scrub_write_block_to_dev_replace() from @@ -641,6 +641,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, return ret; down_write(&dev_replace->rwsem); + dev_replace->replace_task = current; switch (dev_replace->replace_state) { case BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED: case BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED: @@ -994,6 +995,7 @@ error: list_add(&tgt_device->dev_alloc_list, &fs_devices->alloc_list); fs_devices->rw_devices++; + dev_replace->replace_task = NULL; up_write(&dev_replace->rwsem); btrfs_rm_dev_replace_blocked(fs_info); |