From: Julia Lawall <julia@diku.dk>
To: sct@redhat.com, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/7] fs/ext{2,3,4}: Use BUG_ON
Date: Sun, 17 Feb 2008 18:55:06 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.64.0802171854270.28055@ask.diku.dk> (raw)
From: Julia Lawall <julia@diku.dk>
if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.
fs/ext2/balloc.c | 3 +--
fs/ext2/dir.c | 3 +--
fs/ext3/balloc.c | 3 +--
fs/ext4/balloc.c | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@ disable unlikely @ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)
@@ expression E,f; @@
(
if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
diff -u -p a/fs/ext2/balloc.c b/fs/ext2/balloc.c
--- a/fs/ext2/balloc.c 2008-02-10 22:34:14.000000000 +0100
+++ b/fs/ext2/balloc.c 2008-02-17 16:39:35.000000000 +0100
@@ -245,8 +245,7 @@ restart:
prev = rsv;
}
printk("Window map complete.\n");
- if (bad)
- BUG();
+ BUG_ON(bad);
}
#define rsv_window_dump(root, verbose) \
__rsv_window_dump((root), (verbose), __FUNCTION__)
diff -u -p a/fs/ext2/dir.c b/fs/ext2/dir.c
--- a/fs/ext2/dir.c 2008-02-10 22:34:14.000000000 +0100
+++ b/fs/ext2/dir.c 2008-02-17 16:39:36.000000000 +0100
@@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_dis
{
if (len == (1 << 16))
return cpu_to_le16(EXT2_MAX_REC_LEN);
- else if (len > (1 << 16))
- BUG();
+ else
+ BUG_ON(len > (1 << 16));
return cpu_to_le16(len);
}
diff -u -p a/fs/ext3/balloc.c b/fs/ext3/balloc.c
--- a/fs/ext3/balloc.c 2008-02-10 22:34:14.000000000 +0100
+++ b/fs/ext3/balloc.c 2008-02-17 16:39:38.000000000 +0100
@@ -232,8 +232,7 @@ restart:
prev = rsv;
}
printk("Window map complete.\n");
- if (bad)
- BUG();
+ BUG_ON(bad);
}
#define rsv_window_dump(root, verbose) \
__rsv_window_dump((root), (verbose), __FUNCTION__)
diff -u -p a/fs/ext4/balloc.c b/fs/ext4/balloc.c
--- a/fs/ext4/balloc.c 2008-02-10 22:34:14.000000000 +0100
+++ b/fs/ext4/balloc.c 2008-02-17 16:39:39.000000000 +0100
@@ -356,8 +356,7 @@ restart:
prev = rsv;
}
printk("Window map complete.\n");
- if (bad)
- BUG();
+ BUG_ON(bad);
}
#define rsv_window_dump(root, verbose) \
__rsv_window_dump((root), (verbose), __FUNCTION__)
next reply other threads:[~2008-02-17 17:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-17 17:55 Julia Lawall [this message]
2008-02-17 20:33 ` Theodore Tso
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=Pine.LNX.4.64.0802171854270.28055@ask.diku.dk \
--to=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sct@redhat.com \
/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
all inboxes | Powered by JetHome®