From f75a55adc4f01c7100cd9f098e2f6e3ebf5c0ebb Mon Sep 17 00:00:00 2001 From: Stefan Behrens Date: Mon, 5 Nov 2012 17:11:06 +0100 Subject: [PATCH] --- yaml --- r: 346686 b: refs/heads/master c: 1acd6831d98779c88cd57f0a5826d6df0b09f3fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/super.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20d45cf087d2..e100edeffba0 100644 --- 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 index a1a6c296ddcd..ef2415896b06 100644 --- 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); } }