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>
This commit is contained in:
Julia Lawall 2008-04-28 02:16:02 -07:00 committed by Linus Torvalds
parent 4c8b3125f8
commit 2c11619a59
2 changed files with 3 additions and 4 deletions

View file

@ -245,8 +245,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,
prev = rsv; prev = rsv;
} }
printk("Window map complete.\n"); printk("Window map complete.\n");
if (bad) BUG_ON(bad);
BUG();
} }
#define rsv_window_dump(root, verbose) \ #define rsv_window_dump(root, verbose) \
__rsv_window_dump((root), (verbose), __FUNCTION__) __rsv_window_dump((root), (verbose), __FUNCTION__)

View file

@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_disk(unsigned len)
{ {
if (len == (1 << 16)) if (len == (1 << 16))
return cpu_to_le16(EXT2_MAX_REC_LEN); return cpu_to_le16(EXT2_MAX_REC_LEN);
else if (len > (1 << 16)) else
BUG(); BUG_ON(len > (1 << 16));
return cpu_to_le16(len); return cpu_to_le16(len);
} }