From patchwork Fri Dec 19 08:56:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wengang Wang X-Patchwork-Id: 422806 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 D74EE1400A0 for ; Fri, 19 Dec 2014 19:55:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751998AbaLSIza (ORCPT ); Fri, 19 Dec 2014 03:55:30 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:39541 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbaLSIza (ORCPT ); Fri, 19 Dec 2014 03:55:30 -0500 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id sBJ8tTtR024802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 Dec 2014 08:55:29 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id sBJ8tSlj016437 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 19 Dec 2014 08:55:28 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userz7022.oracle.com (8.14.5+Sun/8.14.4) with ESMTP id sBJ8tRfJ002512 for ; Fri, 19 Dec 2014 08:55:28 GMT Received: from oracle.com (/10.182.64.159) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 19 Dec 2014 00:55:27 -0800 From: Wengang Wang To: netdev@vger.kernel.org Cc: wen.gang.wang@oracle.com Subject: [PATCH] bonding: avoid re-entry of bond_release Date: Fri, 19 Dec 2014 16:56:57 +0800 Message-Id: <1418979417-28867-1-git-send-email-wen.gang.wang@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If bond_release is run against an interface which is already detached from it's master, then there is an error message shown like " cannot release ". The call path is: bond_do_ioctl() bond_release() __bond_release_one() Though it does not really harm, the message the message is misleading. This patch tries to avoid the message. Signed-off-by: Wengang Wang --- drivers/net/bonding/bond_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 184c434..4a71bbd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3256,7 +3256,10 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd break; case BOND_RELEASE_OLD: case SIOCBONDRELEASE: - res = bond_release(bond_dev, slave_dev); + if (slave_dev->flags & IFF_SLAVE) + res = bond_release(bond_dev, slave_dev); + else + res = 0; break; case BOND_SETHWADDR_OLD: case SIOCBONDSETHWADDR: