2008-02-17 17:56:36

by Julia Lawall

Subject: [PATCH 4/7] fs/udf/truncate.c: Use BUG_ON

From: Julia Lawall <[email protected]>

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 <[email protected]>

---

diff -u -p a/fs/udf/truncate.c b/fs/udf/truncate.c
--- a/fs/udf/truncate.c 2008-02-10 22:34:15.000000000 +0100
+++ b/fs/udf/truncate.c 2008-02-17 16:41:19.000000000 +0100
@@ -224,8 +224,7 @@ void udf_truncate_extents(struct inode *
if (indirect_ext_len) {
/* We managed to free all extents in the
* indirect extent - free it too */
- if (!epos.bh)
- BUG();
+ BUG_ON(!epos.bh);
udf_free_blocks(sb, inode, epos.block,
0, indirect_ext_len);
} else {
@@ -272,8 +271,7 @@ void udf_truncate_extents(struct inode *
}

if (indirect_ext_len) {
- if (!epos.bh)
- BUG();
+ BUG_ON(!epos.bh);
udf_free_blocks(sb, inode, epos.block, 0,
indirect_ext_len);
} else {

2008-02-17 19:30:13

by Marcin Ślusarz

Subject: Re: [PATCH 4/7] fs/udf/truncate.c: Use BUG_ON

On Sun, Feb 17, 2008 at 06:56:18PM +0100, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> 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 same change is in my patch which is waiting for inclusion.

http://lkml.org/lkml/2008/1/30/512

> 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 <[email protected]>
>
> ---
>
> diff -u -p a/fs/udf/truncate.c b/fs/udf/truncate.c
> --- a/fs/udf/truncate.c 2008-02-10 22:34:15.000000000 +0100
> +++ b/fs/udf/truncate.c 2008-02-17 16:41:19.000000000 +0100
> @@ -224,8 +224,7 @@ void udf_truncate_extents(struct inode *
> if (indirect_ext_len) {
> /* We managed to free all extents in the
> * indirect extent - free it too */
> - if (!epos.bh)
> - BUG();
> + BUG_ON(!epos.bh);
> udf_free_blocks(sb, inode, epos.block,
> 0, indirect_ext_len);
> } else {
> @@ -272,8 +271,7 @@ void udf_truncate_extents(struct inode *
> }
>
> if (indirect_ext_len) {
> - if (!epos.bh)
> - BUG();
> + BUG_ON(!epos.bh);
> udf_free_blocks(sb, inode, epos.block, 0,
> indirect_ext_len);
> } else {
> -
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html