Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872AbZCJFMG (ORCPT ); Tue, 10 Mar 2009 01:12:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752807AbZCJFLa (ORCPT ); Tue, 10 Mar 2009 01:11:30 -0400 Received: from an-out-0708.google.com ([209.85.132.247]:28246 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbZCJFLZ (ORCPT ); Tue, 10 Mar 2009 01:11:25 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=TSXqFz3OnNAH+MxsW5iPb7pS9pWfiWqCOi0R41ghsuJZfIgIQu5itz5v74m1VhJJLi PmmvGyGcmFCoJOhVcBtpT8DrI0L+kTTkAjk+dnlA6oA2tDm9q57I/GJHK5SiaPqAEBhI 97inxdvk/PSObdBAfl2t0a6pyrd5O5YqX1yZk= From: Stoyan Gaydarov To: linux-kernel@vger.kernel.org Cc: Stoyan Gaydarov , chris.mason@oracle.com, linux-btrfs@vger.kernel.org Subject: [PATCH 01/25] [btrfs] BUG to BUG_ON changes Date: Tue, 10 Mar 2009 00:10:26 -0500 Message-Id: <1236661850-8237-2-git-send-email-stoyboyker@gmail.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1236661850-8237-1-git-send-email-stoyboyker@gmail.com> References: <1236661850-8237-1-git-send-email-stoyboyker@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2234 Lines: 72 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(); 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; } -- 1.6.1.3 -- 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/