From mboxrd@z Thu Jan 1 00:00:00 1970 From: Li Zefan Subject: [PATCH 2/2] Btrfs: fix space leak when trimming free extents Date: Tue, 21 Jun 2011 13:50:10 +0800 Message-ID: <4E003112.9050702@cn.fujitsu.com> References: <4E0030DF.4080704@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: lidongyang@novell.com To: "linux-btrfs@vger.kernel.org" Return-path: In-Reply-To: <4E0030DF.4080704@cn.fujitsu.com> List-ID: When the end of an extent exceeds the end of the specified range, the extent will be accidentally truncated. Signed-off-by: Li Zefan --- fs/btrfs/free-space-cache.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 292c0d9..185cf8e 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -2509,8 +2509,15 @@ int btrfs_trim_block_group(struct btrfs_block_group_cache *block_group, bytes = min(entry->bytes, end - start); if (bytes < minlen) goto next; + unlink_free_space(ctl, entry); - kmem_cache_free(btrfs_free_space_cachep, entry); + if (bytes < entry->bytes) { + entry->offset = entry->offset + bytes; + entry->bytes = entry->bytes - bytes; + link_free_space(ctl, entry); + } else { + kmem_cache_free(btrfs_free_space_cachep, entry); + } } spin_unlock(&ctl->tree_lock); -- 1.7.3.1