diff options
| author | Julia Lawall <julia@diku.dk> | 2008-04-28 02:16:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 08:58:43 -0700 |
| commit | 2c11619a590e13fecc801c9c50859cba29740f38 (patch) | |
| tree | 016c01a5a9558b1540514e5159444cec3614d1ca | |
| parent | 4c8b3125f8dcefd1ee2990113fe69cfa9e9fa609 (diff) | |
fs/ext2: use BUG_ON
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.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ext2/balloc.c | 3 | ||||
| -rw-r--r-- | fs/ext2/dir.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index e7b2bafa1dd..c834f512dce 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -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 --git a/fs/ext2/dir.c b/fs/ext2/dir.c index a0995eb2dc2..dd9dbb25eab 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_disk(unsigned len) { 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); } |