public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Stoyan Gaydarov <stoyboyker@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Stoyan Gaydarov <stoyboyker@gmail.com>,
	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	[thread overview]
Message-ID: <1236661850-8237-2-git-send-email-stoyboyker@gmail.com> (raw)
In-Reply-To: <1236661850-8237-1-git-send-email-stoyboyker@gmail.com>

Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
 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


  reply	other threads:[~2009-03-10  5:12 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-10  5:10 [PATCH 00/25] BUG to BUG_ON changes Stoyan Gaydarov
2009-03-10  5:10 ` Stoyan Gaydarov [this message]
2009-03-10  5:10   ` [PATCH 02/25] [staging] " Stoyan Gaydarov
2009-03-10  5:10     ` [PATCH 03/25] [net] " Stoyan Gaydarov
2009-03-10  5:10       ` [PATCH 04/25] [arm] " Stoyan Gaydarov
2009-03-10  5:10         ` [PATCH 05/25] [ia64] " Stoyan Gaydarov
2009-03-10  5:10           ` [PATCH 06/25] [mips] " Stoyan Gaydarov
2009-03-10  5:10             ` [PATCH 07/25] [x86] " Stoyan Gaydarov
2009-03-10  5:10               ` [PATCH 08/25] [sparc] " Stoyan Gaydarov
2009-03-10  5:10                 ` [PATCH 09/25] [s390] " Stoyan Gaydarov
2009-03-10  5:10                   ` [PATCH 10/25] [mn10300] " Stoyan Gaydarov
2009-03-10  5:10                     ` [PATCH 11/25] [alpha] " Stoyan Gaydarov
2009-03-10  5:10                       ` [PATCH 12/25] [frv] " Stoyan Gaydarov
2009-03-10  5:10                         ` [PATCH 13/25] [blackfin] " Stoyan Gaydarov
2009-03-10  5:10                           ` [PATCH 14/25] [mm] " Stoyan Gaydarov
2009-03-10  5:10                             ` [PATCH 15/25] [cris] " Stoyan Gaydarov
2009-03-10  5:10                               ` [PATCH 16/25] [m32r] " Stoyan Gaydarov
2009-03-10  5:10                                 ` [PATCH 17/25] [parisc] " Stoyan Gaydarov
2009-03-10  5:10                                   ` [PATCH 18/25] [xtensa] " Stoyan Gaydarov
2009-03-10  5:10                                     ` [PATCH 19/25] [sysctl.c] " Stoyan Gaydarov
2009-03-10  5:10                                       ` [PATCH 20/25] [scsi] " Stoyan Gaydarov
2009-03-10  5:10                                         ` [PATCH 21/25] [afs] " Stoyan Gaydarov
2009-03-10  5:10                                           ` [PATCH 22/25] [reiserfs] " Stoyan Gaydarov
2009-03-10  5:10                                             ` [PATCH 23/25] [drivers/misc] " Stoyan Gaydarov
2009-03-10  5:10                                               ` [PATCH 24/25] [crypto] " Stoyan Gaydarov
2009-03-10  5:10                                                 ` [PATCH 25/25] [drivers] " Stoyan Gaydarov
2009-03-11 11:54                                           ` [PATCH 21/25] [afs] " David Howells
2009-03-13  4:51                                   ` [PATCH 17/25] [parisc] " Kyle McMartin
2009-03-10  7:49                                 ` [PATCH 16/25] [m32r] " Hirokazu Takata
2009-04-02 11:57                               ` [PATCH 15/25] [cris] " Jesper Nilsson
2009-03-11 11:48                         ` [PATCH 12/25] [frv] " David Howells
2009-03-11 11:36                     ` [PATCH 10/25] [mn10300] " David Howells
2009-03-10 11:17                   ` [PATCH 09/25] [s390] " Christian Borntraeger
2009-03-10  5:16                 ` [PATCH 08/25] [sparc] " David Miller
2009-03-10  8:37               ` [PATCH 07/25] [x86] " Ingo Molnar
2009-03-10  8:57               ` [tip:x86/debug] x86: " Stoyan Gaydarov
2009-03-11 19:18             ` [PATCH 06/25] [mips] " Ralf Baechle
2009-03-10  5:16       ` [PATCH 03/25] [net] " David Miller
2009-03-10 10:23       ` Alexey Dobriyan
2009-03-10 11:24         ` David Miller
2009-03-10 19:54       ` Brandeburg, Jesse
2009-03-10 10:22     ` [PATCH 02/25] [staging] " Alexey Dobriyan
2009-03-10  9:16   ` [PATCH 01/25] [btrfs] " David John
2009-03-10 18:16     ` Stoyan Gaydarov
2009-03-10 18:20       ` Oliver Mattos
2009-03-10 13:24   ` Chris Mason

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=1236661850-8237-2-git-send-email-stoyboyker@gmail.com \
    --to=stoyboyker@gmail.com \
    --cc=chris.mason@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@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