diff options
| author | Takashi Iwai <[email protected]> | 2022-09-22 13:47:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2022-09-22 13:47:09 +0200 |
| commit | cbdac8bc2cbf91b42a92869dc938b809054d4fae (patch) | |
| tree | 06118f3dc9ea6dab868ebc89aad68e19cd4c7800 /fs/btrfs/dev-replace.c | |
| parent | 79764ec772bc1346441ae1c4b1f3bd1991d634e8 (diff) | |
| parent | 0a0342ede303fc420f3a388e1ae82da3ae8ff6bd (diff) | |
Merge tag 'asoc-fix-v6.0-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.0
A few device specific fixes, nothing too large, and a new device
ID for a Dell laptop.
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index f43196a893ca..41cddd3ff059 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -165,7 +165,7 @@ no_valid_dev_replace_entry_found: */ if (btrfs_find_device(fs_info->fs_devices, &args)) { btrfs_err(fs_info, - "replace devid present without an active replace item"); +"replace without active item, run 'device scan --forget' on the target device"); ret = -EUCLEAN; } else { dev_replace->srcdev = NULL; @@ -1129,8 +1129,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) up_write(&dev_replace->rwsem); /* Scrub for replace must not be running in suspended state */ - ret = btrfs_scrub_cancel(fs_info); - ASSERT(ret != -ENOTCONN); + btrfs_scrub_cancel(fs_info); trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) { |