From: David Sterba <dsterba@suse.cz>
To: linux-btrfs@vger.kernel.org
Cc: chris.mason@oracle.com, David Sterba <dsterba@suse.cz>,
Josef Bacik <josef@redhat.com>
Subject: [PATCH] btrfs: move extra checks under debug option in btrfs_search_slot
Date: Fri, 3 Jun 2011 14:09:51 +0200 [thread overview]
Message-ID: <1307102991-18308-1-git-send-email-dsterba@suse.cz> (raw)
In-Reply-To: <1307101404-15199-1-git-send-email-dsterba@suse.cz>
CC: Josef Bacik <josef@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
---
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)
--
1.7.5.2.353.g5df3e
next prev parent reply other threads:[~2011-06-03 12:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-03 11:43 [PATCH] btrfs: add CONFIG_BTRFS_DEBUG option David Sterba
2011-06-03 12:09 ` David Sterba [this message]
2011-06-03 13:59 ` [PATCH] btrfs: move extra checks under debug option in btrfs_search_slot Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307102991-18308-1-git-send-email-dsterba@suse.cz \
--to=dsterba@suse.cz \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).