From patchwork Fri Jun 3 12:09:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 846502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p53CAA7v016803 for ; Fri, 3 Jun 2011 12:10:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752255Ab1FCMKG (ORCPT ); Fri, 3 Jun 2011 08:10:06 -0400 Received: from cantor.suse.de ([195.135.220.2]:37447 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515Ab1FCMKF (ORCPT ); Fri, 3 Jun 2011 08:10:05 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 6B6A974609; Fri, 3 Jun 2011 14:10:04 +0200 (CEST) Received: by ds.suse.cz (Postfix, from userid 10065) id C51C1747E1; Fri, 3 Jun 2011 14:10:03 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: chris.mason@oracle.com, David Sterba , Josef Bacik Subject: [PATCH] btrfs: move extra checks under debug option in btrfs_search_slot Date: Fri, 3 Jun 2011 14:09:51 +0200 Message-Id: <1307102991-18308-1-git-send-email-dsterba@suse.cz> X-Mailer: git-send-email 1.7.5.2.353.g5df3e In-Reply-To: <1307101404-15199-1-git-send-email-dsterba@suse.cz> References: <1307101404-15199-1-git-send-email-dsterba@suse.cz> 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.6 (demeter2.kernel.org [140.211.167.43]); Fri, 03 Jun 2011 12:10:10 +0000 (UTC) CC: Josef Bacik Signed-off-by: David Sterba Reviewed-by: Josef Bacik --- this patch is in conflict with josef's patch http://git.kernel.org/?p=linux/kernel/git/josef/btrfs-work.git;a=commit;h=98cdd9ffc5da7aa4c516347f7fc8f65cb08df6ae fs/btrfs/ctree.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index b0e18d9..4fe7634 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1648,9 +1648,11 @@ again: } cow_done: BUG_ON(!cow && ins_len); +#ifdef CONFIG_BTRFS_DEBUG if (level != btrfs_header_level(b)) WARN_ON(1); level = btrfs_header_level(b); +#endif p->nodes[level] = b; if (!p->skip_locking)