---

yaml --- r: 297880 b: refs/heads/master c: b68dc2a h: refs/heads/master v: v3
git-mirror · Mar 22, 2012 · 85caa91 · 85caa91
1 parent 39ce7d6
commit 85caa91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5df957328b18baa731307c66cfe8e7a4981df65
+refs/heads/master: b68dc2a93e794c8507338c91577a277efa4555d5
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
@@ -474,7 +474,10 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
 			    BTRFS_FSID_SIZE);
 
 	ret = update_ref_for_cow(trans, root, buf, cow, &last_ref);
-	BUG_ON(ret);
+	if (ret) {
+		btrfs_std_error(root->fs_info, ret);
+		return ret;
+	}
 
 	if (root->ref_cows)
 		btrfs_reloc_cow_block(trans, root, buf, cow);