From 1f65418e9d0bec6f08b4369e180002a52a9fda01 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 14 Oct 2011 06:31:20 -0400 Subject: [PATCH] --- yaml --- r: 274679 b: refs/heads/master c: 1eae31e918972bbeefc119d23c1d67674f49a301 h: refs/heads/master i: 274677: 98d7868f637f1769db0046fce468348a1ff6e2af 274675: 8d1ffc0f13fc683ff86ba0254afba9b99565fab7 274671: d57bc7702e49c453a59259a3f6a52d34aa00aa42 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/free-space-cache.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b91a838a7928..b18e6346d5f8 100644 --- 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 index de205d59b74b..f49475dfa954 100644 --- a/trunk/fs/btrfs/free-space-cache.c +++ b/trunk/fs/btrfs/free-space-cache.c @@ -1868,6 +1868,7 @@ 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; } @@ -1875,7 +1876,8 @@ int btrfs_remove_free_space(struct btrfs_block_group_cache *block_group, 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; }