Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971Ab0HWNJj (ORCPT ); Mon, 23 Aug 2010 09:09:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55652 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751480Ab0HWNJi (ORCPT ); Mon, 23 Aug 2010 09:09:38 -0400 Date: Mon, 23 Aug 2010 09:09:32 -0400 From: Josef Bacik To: Li Zefan Cc: Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org, LKML Subject: Re: [PATCH 4/6] btrfs: update stats when allocating from a cluster Message-ID: <20100823130932.GD2404@localhost.localdomain> References: <4C71CD4B.10606@cn.fujitsu.com> <4C71CD91.4050703@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C71CD91.4050703@cn.fujitsu.com> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1476 Lines: 49 On Mon, Aug 23, 2010 at 09:23:29AM +0800, Li Zefan wrote: > When allocating extent entry from a cluster, we should update > the free_space and free_extents fields of the block group. > > Signed-off-by: Li Zefan > --- > fs/btrfs/free-space-cache.c | 17 ++++++++++++++--- > 1 files changed, 14 insertions(+), 3 deletions(-) > > diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c > index 631e14f..20f3141 100644 > --- a/fs/btrfs/free-space-cache.c > +++ b/fs/btrfs/free-space-cache.c > @@ -1090,15 +1090,26 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, > entry->offset += bytes; > entry->bytes -= bytes; > > - if (entry->bytes == 0) { > + if (entry->bytes == 0) > rb_erase(&entry->offset_index, &cluster->root); > - kfree(entry); > - } > break; > } > out: > spin_unlock(&cluster->lock); > > + if (!ret) > + return 0; > + > + spin_lock(&block_group->tree_lock); > + > + block_group->free_space -= bytes; > + if (entry->bytes == 0) { > + block_group->free_extents--; > + kfree(entry); > + } > + > + spin_unlock(&block_group->tree_lock); > + Move this part up so we don't drop the spinlock and then re-grab it. Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/