net: convert BUG_TRAP to generic WARN_ON
Removes legacy reinvent-the-wheel type thing. The generic machinery integrates much better to automated debugging aids such as kerneloops.org (and others), and is unambiguous due to better naming. Non-intuively BUG_TRAP() is actually equal to WARN_ON() rather than BUG_ON() though some might actually be promoted to BUG_ON() but I left that to future. I could make at least one BUILD_BUG_ON conversion. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
53e5e96ec1
commit
547b792cac
@@ -138,8 +138,8 @@ void in_dev_finish_destroy(struct in_device *idev)
|
||||
{
|
||||
struct net_device *dev = idev->dev;
|
||||
|
||||
BUG_TRAP(!idev->ifa_list);
|
||||
BUG_TRAP(!idev->mc_list);
|
||||
WARN_ON(idev->ifa_list);
|
||||
WARN_ON(idev->mc_list);
|
||||
#ifdef NET_REFCNT_DEBUG
|
||||
printk(KERN_DEBUG "in_dev_finish_destroy: %p=%s\n",
|
||||
idev, dev ? dev->name : "NIL");
|
||||
@@ -399,7 +399,7 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
|
||||
}
|
||||
ipv4_devconf_setall(in_dev);
|
||||
if (ifa->ifa_dev != in_dev) {
|
||||
BUG_TRAP(!ifa->ifa_dev);
|
||||
WARN_ON(ifa->ifa_dev);
|
||||
in_dev_hold(in_dev);
|
||||
ifa->ifa_dev = in_dev;
|
||||
}
|
||||
|
Reference in New Issue
Block a user