From patchwork Fri Apr 30 13:55:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Pemberton X-Patchwork-Id: 95954 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3UICIlK023902 for ; Fri, 30 Apr 2010 18:12:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933675Ab0D3SLq (ORCPT ); Fri, 30 Apr 2010 14:11:46 -0400 Received: from viridian.itc.Virginia.EDU ([128.143.12.139]:46095 "EHLO viridian.itc.virginia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933393Ab0D3SLO (ORCPT ); Fri, 30 Apr 2010 14:11:14 -0400 Received: by viridian.itc.virginia.edu (Postfix, from userid 1249) id B21E24122D; Fri, 30 Apr 2010 09:55:12 -0400 (EDT) From: Bill Pemberton To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs: fix shadows sparse warning Date: Fri, 30 Apr 2010 09:55:12 -0400 Message-Id: <1272635712-9599-1-git-send-email-wfp5p@virginia.edu> X-Mailer: git-send-email 1.7.0.6 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 30 Apr 2010 18:12:37 +0000 (UTC) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index f488fac..c0d91fb 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1075,8 +1075,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, while(1) { if (entry->bytes < bytes || entry->offset < min_start) { - struct rb_node *node; - node = rb_next(&entry->offset_index); if (!node) break; @@ -1227,7 +1225,7 @@ again: */ while (entry->bitmap || found_bitmap || (!entry->bitmap && entry->bytes < min_bytes)) { - struct rb_node *node = rb_next(&entry->offset_index); + node = rb_next(&entry->offset_index); if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster,