---

yaml --- r: 346717 b: refs/heads/master c: af1be4f h: refs/heads/master i: 346715: 59ce0b9 v: v3
git-mirror · Dec 17, 2012 · 8fc3fe8 · 8fc3fe8
1 parent 954cddb
commit 8fc3fe8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9c83748deb94aba89b5c1085f887ddcdab223ef
+refs/heads/master: af1be4f851db4f4975f0139211a6561776ef37c0
diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c
@@ -2657,7 +2657,8 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
 		btrfs_put_block_group(cache);
 		if (ret)
 			break;
-		if (atomic64_read(&dev_replace->num_write_errors) > 0) {
+		if (is_dev_replace &&
+		    atomic64_read(&dev_replace->num_write_errors) > 0) {
 			ret = -EIO;
 			break;
 		}