Skip to contentSkip to conversation

change if() BUG();

PATCH In review Eric Sesterhenn / snakebyte 3 participants 3 messages Jan 17, 2006 – Jan 19, 2006 Kernel janitors

lore
Share & tools
lore

Eric Sesterhenn / snakebyte

author
#0 lore raw

PATCH 1/1 change if() BUG();

hi,

this patch changes the if() BUG(); construct in
drivers/ieee1394/cmp.c to a BUG_ON; so defining
BUG to a no-op is safe.

Signed-off-by Eric Sesterhenn <[email protected]>
drivers/ieee1394/cmp.c renamed from drivers/ieee1394/cmp.c.orig +1 -1
@@ -129,7 +129,7 @@ void cmp_unregister_opcr(struct hpsb_hos
 
 	ch = hpsb_get_hostinfo(&cmp_highlevel, host);
 	plug = (struct plug *)opcr;
-	if (plug - ch->opcr >= ch->u.ompr.nplugs) BUG();
+	BUG_ON(plug - ch->opcr >= ch->u.ompr.nplugs);
 
 	plug->u.pcr.online = 0;
 	plug->update = NULL;

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

drivers/net/ixgb/ixgb_osdep.h typedef enum { · line 63

Quoted 12 lines · Eric Sesterhenn / snakebyte

this patch changes the if() BUG(); construct in drivers/net/ixgb/ixgb_osdep.h to a BUG_ON; so defining BUG to a no-op is safe.

drivers/net/ixgb/ixgb_osdep.h renamed from drivers/net/ixgb/ixgb_osdep.h.orig +1 -1
@@ -60,7 +60,7 @@ typedef enum {
 } boolean_t;
 
 #undef ASSERT
-#define ASSERT(x)	if(!(x)) BUG()
+#define ASSERT(x)	BUG_ON(!(x))

Naah. Just Drop It (TM).

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw
In reply to Eric Sesterhenn / snakebyte
Quoted 10 lines · Alexey Dobriyan
Quoted 9 lines · Eric Sesterhenn / snakebyte

this patch changes the if() BUG(); construct in drivers/net/ixgb/ixgb_osdep.h to a BUG_ON; so defining BUG to a no-op is safe.

drivers/net/ixgb/ixgb_osdep.h renamed from drivers/net/ixgb/ixgb_osdep.h.orig +0 -0
@@ -60,7 +60,7 @@ typedef enum {
 } boolean_t;
Quoted 5 lines

drivers/net/ixgb/ixgb_osdep.h typedef enum { · line 63

Quoted 3 lines
drivers/net/ixgb/ixgb_osdep.h renamed from drivers/net/ixgb/ixgb_osdep.h.orig +1 -1
 #undef ASSERT
-#define ASSERT(x)	if(!(x)) BUG()
+#define ASSERT(x)	BUG_ON(!(x))

Naah. Just Drop It (TM).

AFAIR, this driver is both actively maintained by Intel and shared between operating systems (e.g. FreeBSD contains the same driver).

Therefore dropping this ASSERT is not possible.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors