From patchwork Tue Jan 29 19:59:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milos Vyletel X-Patchwork-Id: 216645 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 32EB72C009A for ; Wed, 30 Jan 2013 06:59:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752422Ab3A2T7w (ORCPT ); Tue, 29 Jan 2013 14:59:52 -0500 Received: from mail4.sde.cz ([85.93.125.197]:44610 "EHLO sde.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751067Ab3A2T7v (ORCPT ); Tue, 29 Jan 2013 14:59:51 -0500 Received: by sde.cz (Postfix, from userid 1002) id BEAE769F415E; Tue, 29 Jan 2013 20:59:49 +0100 (CET) Received: from leaf-12.tekelec.com (unknown [199.72.20.10]) by sde.cz (Postfix) with ESMTPSA id DA08F69F415B; Tue, 29 Jan 2013 20:59:48 +0100 (CET) From: Milos Vyletel To: netdev@vger.kernel.org Cc: fubar@us.ibm.com, andy@greyhouse.net, Milos Vyletel Subject: [PATCH v2] bonding: unset primary slave via sysfs Date: Tue, 29 Jan 2013 14:59:00 -0500 Message-Id: <1359489540-14620-1-git-send-email-milos.vyletel@sde.cz> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1359393652-2804-1-git-send-email-milos.vyletel@sde.cz> References: <1359393652-2804-1-git-send-email-milos.vyletel@sde.cz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When bonding module is loaded with primary parameter and one decides to unset primary slave using sysfs these settings are not preserved during bond device restart. Primary slave is only unset once and it's not remembered in bond->params structure. Below is example of recreation. grep OPTS /etc/sysconfig/network-scripts/ifcfg-bond0 BONDING_OPTS="mode=active-backup miimon=100 primary=eth01" grep "Primary Slave" /proc/net/bonding/bond0 Primary Slave: eth01 (primary_reselect always) echo "" > /sys/class/net/bond0/bonding/primary grep "Primary Slave" /proc/net/bonding/bond0 Primary Slave: None sed -i -e 's/primary=eth01//' /etc/sysconfig/network-scripts/ifcfg-bond0 grep OPTS /etc/sysconfig/network-scripts/ifcfg-bond BONDING_OPTS="mode=active-backup miimon=100 " ifdown bond0 && ifup bond0 without patch: grep "Primary Slave" /proc/net/bonding/bond0 Primary Slave: eth01 (primary_reselect always) with patch: grep "Primary Slave" /proc/net/bonding/bond0 Primary Slave: None Reviewed-by: Jiri Pirko Signed-off-by: Milos Vyletel Signed-off-by: Jay Vosburgh --- drivers/net/bonding/bond_sysfs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index ef8d2a0..155f3b4 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1067,6 +1067,7 @@ static ssize_t bonding_store_primary(struct device *d, pr_info("%s: Setting primary slave to None.\n", bond->dev->name); bond->primary_slave = NULL; + memset(bond->params.primary, 0, sizeof(bond->params.primary)); bond_select_active_slave(bond); goto out; }