| Message ID | 1307102991-18308-1-git-send-email-dsterba@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/03/2011 08:09 AM, David Sterba wrote: > CC: Josef Bacik <josef@redhat.com> > Signed-off-by: David Sterba <dsterba@suse.cz> > --- > Lets use this instead, I'll drop mine. Thanks, Reviewed-by: Josef Bacik <josef@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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(-)