Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753821AbZCJJRH (ORCPT ); Tue, 10 Mar 2009 05:17:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753607AbZCJJQx (ORCPT ); Tue, 10 Mar 2009 05:16:53 -0400 Received: from mail-qy0-f122.google.com ([209.85.221.122]:62860 "EHLO mail-qy0-f122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753567AbZCJJQv (ORCPT ); Tue, 10 Mar 2009 05:16:51 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=nqFxyQsAyBHuU5JOGwr0lP+Zv2AmKHkHKPkpkjNbAcNkNWB+KdknYwXUfpc5cJG4ww ME90lrVmzA6150hXkRBh7dDzY+day/0CZ3ItEQMhozU0JDIAafxBpTZQdKvlemlUzzbL i/CnxaFGHd2jezCFuV/Yl+hpaSVkGa3GLJXuA= Message-ID: <49B62FF2.7020607@gmail.com> Date: Tue, 10 Mar 2009 14:46:34 +0530 From: David John Reply-To: davidjonx@gmail.com User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Stoyan Gaydarov CC: linux-kernel@vger.kernel.org, chris.mason@oracle.com, linux-btrfs@vger.kernel.org Subject: Re: [PATCH 01/25] [btrfs] BUG to BUG_ON changes References: <1236661850-8237-1-git-send-email-stoyboyker@gmail.com> <1236661850-8237-2-git-send-email-stoyboyker@gmail.com> In-Reply-To: <1236661850-8237-2-git-send-email-stoyboyker@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2406 Lines: 74 Stoyan Gaydarov wrote: > Signed-off-by: Stoyan Gaydarov > --- > fs/btrfs/ctree.c | 3 +-- > fs/btrfs/extent-tree.c | 3 +-- > fs/btrfs/free-space-cache.c | 3 +-- > fs/btrfs/tree-log.c | 3 +-- > 4 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c > index 37f31b5..2c590b0 100644 > --- a/fs/btrfs/ctree.c > +++ b/fs/btrfs/ctree.c > @@ -2174,8 +2174,7 @@ static int insert_ptr(struct btrfs_trans_handle *trans, struct btrfs_root > BUG_ON(!path->nodes[level]); > lower = path->nodes[level]; > nritems = btrfs_header_nritems(lower); > - if (slot > nritems) > - BUG(); > + BUG_ON(slot > nritems); > if (nritems == BTRFS_NODEPTRS_PER_BLOCK(root)) > BUG(); ^ You seem to have missed one. > if (slot != nritems) { > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index 9abf81f..0314ab6 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -672,8 +672,7 @@ static noinline int insert_extents(struct btrfs_trans_handle *trans, > keys+i, data_size+i, total-i); > BUG_ON(ret < 0); > > - if (last && ret > 1) > - BUG(); > + BUG_ON(last && ret > 1); > > leaf = path->nodes[0]; > for (c = 0; c < ret; c++) { > diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c > index d1e5f0e..b0c7661 100644 > --- a/fs/btrfs/free-space-cache.c > +++ b/fs/btrfs/free-space-cache.c > @@ -267,8 +267,7 @@ static int __btrfs_add_free_space(struct btrfs_block_group_cache *block_group, > out: > if (ret) { > printk(KERN_ERR "btrfs: unable to add free space :%d\n", ret); > - if (ret == -EEXIST) > - BUG(); > + BUG_ON(ret == -EEXIST); > } > > kfree(alloc_info); > diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c > index 9c462fb..2c892f6 100644 > --- a/fs/btrfs/tree-log.c > +++ b/fs/btrfs/tree-log.c > @@ -1150,8 +1150,7 @@ insert: > ret = insert_one_name(trans, root, path, key->objectid, key->offset, > name, name_len, log_type, &log_key); > > - if (ret && ret != -ENOENT) > - BUG(); > + BUG_ON(ret && ret != -ENOENT); > goto out; > } > -- 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/