Message ID | 1434046842-24601-1-git-send-email-sfeldma@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: sfeldma@gmail.com Date: Thu, 11 Jun 2015 11:20:42 -0700 > From: Scott Feldman <sfeldma@gmail.com> > > This particular BUG_ON condition was checking for attr set err in the > COMMIT phase, which isn't expected (it's a driver bug if PREPARE phase is > OK but COMMIT fails). But BUG_ON() is too strong for this case, so change > to WARN(). BUG_ON() would be warranted if the system was corrupted beyond > repair, but this is not the case here. > > Signed-off-by: Scott Feldman <sfeldma@gmail.com> Applied, thanks Scott. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 11, 2015 at 4:27 PM, David Miller <davem@davemloft.net> wrote: > From: sfeldma@gmail.com > Date: Thu, 11 Jun 2015 11:20:42 -0700 > >> From: Scott Feldman <sfeldma@gmail.com> >> >> This particular BUG_ON condition was checking for attr set err in the >> COMMIT phase, which isn't expected (it's a driver bug if PREPARE phase is >> OK but COMMIT fails). But BUG_ON() is too strong for this case, so change >> to WARN(). BUG_ON() would be warranted if the system was corrupted beyond >> repair, but this is not the case here. >> >> Signed-off-by: Scott Feldman <sfeldma@gmail.com> > > Applied, thanks Scott. I think this one slipped thru the cracks. I'm not seeing it in net-next. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 658bc3a..a5d0f8e 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -184,7 +184,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) attr->trans = SWITCHDEV_TRANS_COMMIT; err = __switchdev_port_attr_set(dev, attr); - BUG_ON(err); + WARN(err, "%s: Commit of attribute (id=%d) failed.\n", + dev->name, attr->id); return err; }