---

yaml --- r: 346686 b: refs/heads/master c: 1acd683 h: refs/heads/master v: v3
git-mirror · Dec 12, 2012 · f75a55a · f75a55a
1 parent c7baea0
commit f75a55a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa1b8cd409f05e1489ec77ff219eff6ed4b801b8
+refs/heads/master: 1acd6831d98779c88cd57f0a5826d6df0b09f3fa
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
@@ -116,7 +116,16 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
 	if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
 		sb->s_flags |= MS_RDONLY;
 		printk(KERN_INFO "btrfs is forced readonly\n");
-		btrfs_scrub_cancel(fs_info);
+		/*
+		 * Note that a running device replace operation is not
+		 * canceled here although there is no way to update
+		 * the progress. It would add the risk of a deadlock,
+		 * therefore the canceling is ommited. The only penalty
+		 * is that some I/O remains active until the procedure
+		 * completes. The next time when the filesystem is
+		 * mounted writeable again, the device replace
+		 * operation continues.
+		 */
 //		WARN_ON(1);
 	}
 }