---

yaml --- r: 274679 b: refs/heads/master c: 1eae31e h: refs/heads/master i: 274677: 98d7868 274675: 8d1ffc0 274671: d57bc77 v: v3
git-mirror · Nov 6, 2011 · 1f65418 · 1f65418
1 parent c699eef
commit 1f65418
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd354ad613a393424f85333ceed6b15e07fb94ae
+refs/heads/master: 1eae31e918972bbeefc119d23c1d67674f49a301
diff --git a/trunk/fs/btrfs/free-space-cache.c b/trunk/fs/btrfs/free-space-cache.c
@@ -1868,14 +1868,16 @@ int btrfs_remove_free_space(struct btrfs_block_group_cache *block_group,
 			ctl->total_bitmaps--;
 		}
 		kmem_cache_free(btrfs_free_space_cachep, info);
+		ret = 0;
 		goto out_lock;
 	}
 
 	if (!info->bitmap && info->offset == offset) {
 		unlink_free_space(ctl, info);
 		info->offset += bytes;
 		info->bytes -= bytes;
-		link_free_space(ctl, info);
+		ret = link_free_space(ctl, info);
+		WARN_ON(ret);
 		goto out_lock;
 	}