This changes some simple "if (x) BUG();" statements to "BUG_ON(x);"
Signed-off-by: Kris Katterjohn <[EMAIL PROTECTED]>
This is a diff from 2.6.15.
Obviously I wasn't able to test these changes per se, but is there a reason they
wouldn't work correctly?
Thanks!
--- x/net/core/dev.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/core/dev.c 2006-01-07 20:00:45.000000000 -0600
@@ -1092,15 +1092,12 @@ int skb_checksum_help(struct sk_buff *sk
goto out;
}
- if (offset > (int)skb->len)
- BUG();
+ BUG_ON(offset > (int)skb->len);
csum = skb_checksum(skb, offset, skb->len-offset, 0);
offset = skb->tail - skb->h.raw;
- if (offset <= 0)
- BUG();
- if (skb->csum + 2 > offset)
- BUG();
+ BUG_ON(offset <= 0);
+ BUG_ON(skb->csum + 2 > offset);
*(u16*)(skb->h.raw + skb->csum) = csum_fold(csum);
skb->ip_summed = CHECKSUM_NONE;
--- x/net/core/skbuff.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/core/skbuff.c 2006-01-07 20:01:55.000000000 -0600
@@ -792,8 +792,7 @@ int ___pskb_trim(struct sk_buff *skb, un
int end = offset + skb_shinfo(skb)->frags[i].size;
if (end > len) {
if (skb_cloned(skb)) {
- if (!realloc)
- BUG();
+ BUG_ON(!realloc);
if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
return -ENOMEM;
}
@@ -895,8 +894,7 @@ unsigned char *__pskb_pull_tail(struct s
struct sk_buff *insp = NULL;
do {
- if (!list)
- BUG();
+ BUG_ON(!list);
if (list->len <= eat) {
/* Eaten as whole. */
@@ -1200,8 +1198,7 @@ unsigned int skb_checksum(const struct s
start = end;
}
}
- if (len)
- BUG();
+ BUG_ON(len);
return csum;
}
@@ -1283,8 +1280,7 @@ unsigned int skb_copy_and_csum_bits(cons
start = end;
}
}
- if (len)
- BUG();
+ BUG_ON(len);
return csum;
}
@@ -1298,8 +1294,7 @@ void skb_copy_and_csum_dev(const struct
else
csstart = skb_headlen(skb);
- if (csstart > skb_headlen(skb))
- BUG();
+ BUG_ON(csstart > skb_headlen(skb));
memcpy(to, skb->data, csstart);
--- x/net/ipv4/icmp.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/ipv4/icmp.c 2006-01-07 20:02:07.000000000 -0600
@@ -898,8 +898,7 @@ static void icmp_address_reply(struct sk
u32 _mask, *mp;
mp = skb_header_pointer(skb, 0, sizeof(_mask), &_mask);
- if (mp == NULL)
- BUG();
+ BUG_ON(mp == NULL);
for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
if (*mp == ifa->ifa_mask &&
inet_ifa_match(rt->rt_src, ifa))
--- x/net/ipv4/inetpeer.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/ipv4/inetpeer.c 2006-01-07 20:02:26.000000000 -0600
@@ -304,8 +304,7 @@ static void unlink_from_pool(struct inet
/* look for a node to insert instead of p */
struct inet_peer *t;
t = lookup_rightempty(p);
- if (*stackptr[-1] != t)
- BUG();
+ BUG_ON(*stackptr[-1] != t);
**--stackptr = t->avl_left;
/* t is removed, t->v4daddr > x->v4daddr for any
* x in p->avl_left subtree.
@@ -314,8 +313,7 @@ static void unlink_from_pool(struct inet
t->avl_left = p->avl_left;
t->avl_right = p->avl_right;
t->avl_height = p->avl_height;
- if (delp[1] != &p->avl_left)
- BUG();
+ BUG_ON(delp[1] != &p->avl_left);
delp[1] = &t->avl_left; /* was &p->avl_left */
}
peer_avl_rebalance(stack, stackptr);
--- x/net/ipv4/tcp_input.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/ipv4/tcp_input.c 2006-01-07 20:02:54.000000000 -0600
@@ -3307,7 +3307,7 @@ tcp_collapse(struct sock *sk, struct sk_
int offset = start - TCP_SKB_CB(skb)->seq;
int size = TCP_SKB_CB(skb)->end_seq - start;
- if (offset < 0) BUG();
+ BUG_ON(offset < 0);
if (size > 0) {
size = min(copy, size);
if (skb_copy_bits(skb, offset, skb_put(nskb,
size), size))
--- x/net/key/af_key.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/key/af_key.c 2006-01-07 20:03:41.000000000 -0600
@@ -297,8 +297,7 @@ static int pfkey_error(struct sadb_msg *
err = EINTR;
if (err >= 512)
err = EINVAL;
- if (err <= 0 || err >= 256)
- BUG();
+ BUG_ON(err <= 0 || err >= 256);
hdr = (struct sadb_msg *) skb_put(skb, sizeof(struct sadb_msg));
pfkey_hdr_dup(hdr, orig);
--- x/net/sctp/sm_sideeffect.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/sctp/sm_sideeffect.c 2006-01-07 20:04:29.000000000 -0600
@@ -1232,8 +1232,7 @@ static int sctp_cmd_interpreter(sctp_eve
case SCTP_CMD_TIMER_START:
timer = &asoc->timers[cmd->obj.to];
timeout = asoc->timeouts[cmd->obj.to];
- if (!timeout)
- BUG();
+ BUG_ON(!timeout);
timer->expires = jiffies + timeout;
sctp_association_hold(asoc);
--- x/net/sunrpc/cache.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/sunrpc/cache.c 2006-01-07 20:04:57.000000000 -0600
@@ -575,12 +575,11 @@ cache_read(struct file *filp, char __use
if (rp->q.list.next == &cd->queue) {
spin_unlock(&queue_lock);
up(&queue_io_sem);
- if (rp->offset)
- BUG();
+ BUG_ON(rp->offset);
return 0;
}
rq = container_of(rp->q.list.next, struct cache_request, q.list);
- if (rq->q.reader) BUG();
+ BUG_ON(rq->q.reader);
if (rp->offset == 0)
rq->readers++;
spin_unlock(&queue_lock);
--- x/net/sunrpc/svc.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/sunrpc/svc.c 2006-01-07 20:05:05.000000000 -0600
@@ -122,8 +122,7 @@ svc_init_buffer(struct svc_rqst *rqstp,
rqstp->rq_argused = 0;
rqstp->rq_resused = 0;
arghi = 0;
- if (pages > RPCSVC_MAXPAGES)
- BUG();
+ BUG_ON(pages > RPCSVC_MAXPAGES);
while (pages) {
struct page *p = alloc_page(GFP_KERNEL);
if (!p)
--- x/net/xfrm/xfrm_algo.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/xfrm/xfrm_algo.c 2006-01-07 20:05:27.000000000 -0600
@@ -540,8 +540,7 @@ void skb_icv_walk(const struct sk_buff *
start = end;
}
}
- if (len)
- BUG();
+ BUG_ON(len);
}
EXPORT_SYMBOL_GPL(skb_icv_walk);
@@ -610,8 +609,7 @@ skb_to_sgvec(struct sk_buff *skb, struct
start = end;
}
}
- if (len)
- BUG();
+ BUG_ON(len);
return elt;
}
EXPORT_SYMBOL_GPL(skb_to_sgvec);
--- x/net/xfrm/xfrm_policy.c 2006-01-02 21:21:10.000000000 -0600
+++ y/net/xfrm/xfrm_policy.c 2006-01-07 20:14:54.000000000 -0600
@@ -247,11 +247,9 @@ EXPORT_SYMBOL(xfrm_policy_alloc);
void __xfrm_policy_destroy(struct xfrm_policy *policy)
{
- if (!policy->dead)
- BUG();
+ BUG_ON(!policy->dead);
- if (policy->bundles)
- BUG();
+ BUG_ON(policy->bundles);
if (del_timer(&policy->timer))
BUG();
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
