From patchwork Thu Jun 11 18:20:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 483252 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BB16D140290 for ; Fri, 12 Jun 2015 04:18:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=EFTi9OBF; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754909AbbFKSSp (ORCPT ); Thu, 11 Jun 2015 14:18:45 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:34169 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754930AbbFKSSo (ORCPT ); Thu, 11 Jun 2015 14:18:44 -0400 Received: by pdbki1 with SMTP id ki1so8341767pdb.1 for ; Thu, 11 Jun 2015 11:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=jkeaBI452qBfNSj9ZP368zxYRyE75AIlpHDoJ+Cup1c=; b=EFTi9OBFxS/XRIbkldkmZzQjRODpXzr+j4pMosV/P4FJUz28kCocL5Ch8MEmFtgDqT RPiNejs08SnZQwl5kcFu3wbYeEhMXKl3zkdBidGBKGqpemFuwnd8o0/CwhnvfhHVdLuu NgpgGQ5YwRvBakx8bHdUalwnRLzRv468lp3bpFUq4YI/R+pnvgW8/edvQC7zq83lmyLV fxwf4baz0uVJRtF7T4CZuxxZi9IScuEf3q/czGfQC/XK4za1LASu3es0YcV6ti0kL+L9 T7TivA4TGzuD8jVa4gse6YFLshtG+3yhcnN8LbMA2A9YX4wuuFSU9cLQ9O+Xt7S8RQ3D ZIzw== X-Received: by 10.70.39.103 with SMTP id o7mr16637682pdk.122.1434046722549; Thu, 11 Jun 2015 11:18:42 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id ps7sm1388497pbb.18.2015.06.11.11.18.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 11:18:37 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, dsahern@gmail.com Subject: [PATCH net-next] switchdev: change BUG_ON to WARN for attr set failure case Date: Thu, 11 Jun 2015 11:20:42 -0700 Message-Id: <1434046842-24601-1-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman 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 --- net/switchdev/switchdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; }