From patchwork Mon Sep 9 20:16:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 273691 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 2B4FE2C00DB for ; Tue, 10 Sep 2013 06:17:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756083Ab3IIURS (ORCPT ); Mon, 9 Sep 2013 16:17:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53729 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756072Ab3IIURQ (ORCPT ); Mon, 9 Sep 2013 16:17:16 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r89KH81i011340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Sep 2013 16:17:09 -0400 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r89KGMDa016628; Mon, 9 Sep 2013 16:17:07 -0400 From: Veaceslav Falico To: netdev@vger.kernel.org Cc: jiri@resnulli.us, Veaceslav Falico , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Alexander Duyck Subject: [PATCH net-next 24/26] net: expose the master link to sysfs, and remove it from bond Date: Mon, 9 Sep 2013 22:16:42 +0200 Message-Id: <1378757804-3159-25-git-send-email-vfalico@redhat.com> In-Reply-To: <1378757804-3159-1-git-send-email-vfalico@redhat.com> References: <1378757804-3159-1-git-send-email-vfalico@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, we can have only one master upper neighbour, so it would be useful to create a symlink to it in the sysfs device directory, the way that bonding now does it, for every device. Lower devices from bridge/team/etc will automagically get it, so we could rely on it. Also, remove the same functionality from bonding. CC: Jay Vosburgh CC: Andy Gospodarek CC: "David S. Miller" CC: Eric Dumazet CC: Jiri Pirko CC: Alexander Duyck Signed-off-by: Veaceslav Falico --- drivers/net/bonding/bond_sysfs.c | 12 +----------- net/core/dev.c | 9 +++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 5d40889..fd178a4 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -174,20 +174,11 @@ int bond_create_slave_symlinks(struct net_device *master, char linkname[IFNAMSIZ+7]; int ret = 0; - /* first, create a link from the slave back to the master */ - ret = sysfs_create_link(&(slave->dev.kobj), &(master->dev.kobj), - "master"); - if (ret) - return ret; - /* next, create a link from the master to the slave */ + /* create a link from the master to the slave */ sprintf(linkname, "slave_%s", slave->name); ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj), linkname); - /* free the master link created earlier in case of error */ - if (ret) - sysfs_remove_link(&(slave->dev.kobj), "master"); - return ret; } @@ -197,7 +188,6 @@ void bond_destroy_slave_symlinks(struct net_device *master, { char linkname[IFNAMSIZ+7]; - sysfs_remove_link(&(slave->dev.kobj), "master"); sprintf(linkname, "slave_%s", slave->name); sysfs_remove_link(&(master->dev.kobj), linkname); } diff --git a/net/core/dev.c b/net/core/dev.c index 8d5473d..510d883 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4638,6 +4638,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev, bool upper, void *private) { struct netdev_adjacent *adj, *neigh = NULL; + int ret; adj = __netdev_find_adj(dev, adj_dev, upper, false); @@ -4693,6 +4694,12 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev, /* Ensure that master upper link is always the first item in list. */ if (master) { + ret = sysfs_create_link(&(dev->dev.kobj), &(adj_dev->dev.kobj), "master"); + if (ret) { + kfree(neigh); + kfree(adj); + return ret; + } if (neigh) list_add_rcu(&neigh->list, &dev->adj_list.upper); @@ -4770,6 +4777,8 @@ void __netdev_adjacent_dev_remove(struct net_device *dev, adj_dev->name, upper ? "upper" : "lower", dev->name, adj_dev->name); list_del_rcu(&neighbour->list); + if (neighbour->master && upper) + sysfs_remove_link(&(dev->dev.kobj), "master"); dev_put(adj_dev); kfree_rcu(neighbour, rcu); }