X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_if.c;h=219a260683902c16265e255b8b5eab41380a8cd2;hb=a8643e447601201aabd1159966bd716e48378f97;hp=f969446c6a7427bd0e47853f8227684beb9ab9ca;hpb=16b82e84fa6e547c9fd7b36873bf89fc25313dc1;p=sliver-openvswitch.git

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index f969446c6..219a26068 100644
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -1,15 +1,19 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
- */
-
-/*
- *	Sysfs attributes of bridge ports for Open vSwitch
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  *
- *  This has been shamelessly copied from the kernel sources.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -187,12 +191,12 @@ static ssize_t brport_store(struct kobject *kobj,
 		return -EPERM;
 
 	pr_warning("%s: xxx writing port parms not supported yet!\n",
-		   dp_name(p->dp));
+		   ovs_dp_name(p->dp));
 
 	return ret;
 }
 
-const struct sysfs_ops brport_sysfs_ops = {
+struct sysfs_ops ovs_brport_sysfs_ops = {
 	.show = brport_show,
 	.store = brport_store,
 };
@@ -202,10 +206,10 @@ const struct sysfs_ops brport_sysfs_ops = {
  * Creates a brport subdirectory with bridge attributes.
  * Puts symlink in bridge's brport subdirectory
  */
-int dp_sysfs_add_if(struct vport *p)
+int ovs_dp_sysfs_add_if(struct vport *p)
 {
 	struct datapath *dp = p->dp;
-	struct vport *local_port = rtnl_dereference(dp->ports[OVSP_LOCAL]);
+	struct vport *local_port = ovs_vport_rtnl(dp, OVSP_LOCAL);
 	struct brport_attribute **a;
 	int err;
 
@@ -213,6 +217,14 @@ int dp_sysfs_add_if(struct vport *p)
 	if (!p->ops->get_kobj)
 		return -ENOENT;
 
+#ifdef CONFIG_NET_NS
+	/* Due to bug in 2.6.32 kernel, sysfs_create_group() could panic
+	 * in other namespace than init_net. Following check is to avoid it. */
+
+	if (!p->kobj.sd)
+		return -ENOENT;
+#endif
+
 	err = kobject_add(&p->kobj, p->ops->get_kobj(p),
 			  SYSFS_BRIDGE_PORT_ATTR);
 	if (err)
@@ -250,7 +262,7 @@ err:
 	return err;
 }
 
-int dp_sysfs_del_if(struct vport *p)
+int ovs_dp_sysfs_del_if(struct vport *p)
 {
 	if (p->linkname[0]) {
 		sysfs_remove_link(&p->dp->ifobj, p->linkname);