aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/dev-replace.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r--fs/btrfs/dev-replace.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index e9bbff3c0029..26c6a770674a 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -218,8 +218,9 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
218 } 218 }
219 ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1); 219 ret = btrfs_search_slot(trans, dev_root, &key, path, -1, 1);
220 if (ret < 0) { 220 if (ret < 0) {
221 btrfs_warn(fs_info, "error %d while searching for dev_replace item!", 221 btrfs_warn(fs_info,
222 ret); 222 "error %d while searching for dev_replace item!",
223 ret);
223 goto out; 224 goto out;
224 } 225 }
225 226
@@ -238,8 +239,9 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
238 */ 239 */
239 ret = btrfs_del_item(trans, dev_root, path); 240 ret = btrfs_del_item(trans, dev_root, path);
240 if (ret != 0) { 241 if (ret != 0) {
241 btrfs_warn(fs_info, "delete too small dev_replace item failed %d!", 242 btrfs_warn(fs_info,
242 ret); 243 "delete too small dev_replace item failed %d!",
244 ret);
243 goto out; 245 goto out;
244 } 246 }
245 ret = 1; 247 ret = 1;
@@ -251,8 +253,8 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,
251 ret = btrfs_insert_empty_item(trans, dev_root, path, 253 ret = btrfs_insert_empty_item(trans, dev_root, path,
252 &key, sizeof(*ptr)); 254 &key, sizeof(*ptr));
253 if (ret < 0) { 255 if (ret < 0) {
254 btrfs_warn(fs_info, "insert dev_replace item failed %d!", 256 btrfs_warn(fs_info,
255 ret); 257 "insert dev_replace item failed %d!", ret);
256 goto out; 258 goto out;
257 } 259 }
258 } 260 }
@@ -772,9 +774,10 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info)
772 break; 774 break;
773 } 775 }
774 if (!dev_replace->tgtdev || !dev_replace->tgtdev->bdev) { 776 if (!dev_replace->tgtdev || !dev_replace->tgtdev->bdev) {
775 btrfs_info(fs_info, "cannot continue dev_replace, tgtdev is missing");
776 btrfs_info(fs_info, 777 btrfs_info(fs_info,
777 "you may cancel the operation after 'mount -o degraded'"); 778 "cannot continue dev_replace, tgtdev is missing");
779 btrfs_info(fs_info,
780 "you may cancel the operation after 'mount -o degraded'");
778 btrfs_dev_replace_unlock(dev_replace, 1); 781 btrfs_dev_replace_unlock(dev_replace, 1);
779 return 0; 782 return 0;
780 } 783 }