---

yaml --- r: 252344 b: refs/heads/master c: c309df0 h: refs/heads/master v: v3
git-mirror · May 26, 2011 · 53930dc · 53930dc
1 parent dc216b4
commit 53930dc
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: 4cb5300bc839b8a943eb19c9f27f25470e22d0ca
+refs/heads/master: c309df07868baa8b05d2a70637096465746fdbb5
diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c
@@ -485,7 +485,8 @@ int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
 again:
 	if (!prealloc && (mask & __GFP_WAIT)) {
 		prealloc = alloc_extent_state(mask);
-		BUG_ON(!prealloc);
+		if (!prealloc)
+			return -ENOMEM;
 	}
 
 	spin_lock(&tree->lock);