From 69bf783dfbc6831bb1ebb471c9dfd8378bf4ed2e Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Tue, 14 Aug 2012 12:34:35 +0000
Subject: [PATCH] --- yaml --- r: 322027 b: refs/heads/master c:
 476ad154f3b41dd7d9a08a2f641e28388abc2fd1 h: refs/heads/master i:   322025:
 34b8eb682ebda7206763b1516d2b78ae09df58e8   322023:
 9c6d5d1cfd2b232be43bf0460d0e356a4e33a227 v: v3

---
 [refs]                          | 2 +-
 trunk/net/core/netprio_cgroup.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7e5737d58527..6123e4d31258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48a87cc26c13b68f6cce4e9d769fcb17a6b3e4b8
+refs/heads/master: 476ad154f3b41dd7d9a08a2f641e28388abc2fd1
diff --git a/trunk/net/core/netprio_cgroup.c b/trunk/net/core/netprio_cgroup.c
index f65dba3afd99..c75e3f9d060f 100644
--- a/trunk/net/core/netprio_cgroup.c
+++ b/trunk/net/core/netprio_cgroup.c
@@ -101,12 +101,10 @@ static int write_update_netdev_table(struct net_device *dev)
 	u32 max_len;
 	struct netprio_map *map;
 
-	rtnl_lock();
 	max_len = atomic_read(&max_prioidx) + 1;
 	map = rtnl_dereference(dev->priomap);
 	if (!map || map->priomap_len < max_len)
 		ret = extend_netdev_table(dev, max_len);
-	rtnl_unlock();
 
 	return ret;
 }
@@ -256,17 +254,17 @@ static int write_priomap(struct cgroup *cgrp, struct cftype *cft,
 	if (!dev)
 		goto out_free_devname;
 
+	rtnl_lock();
 	ret = write_update_netdev_table(dev);
 	if (ret < 0)
 		goto out_put_dev;
 
-	rcu_read_lock();
-	map = rcu_dereference(dev->priomap);
+	map = rtnl_dereference(dev->priomap);
 	if (map)
 		map->priomap[prioidx] = priority;
-	rcu_read_unlock();
 
 out_put_dev:
+	rtnl_unlock();
 	dev_put(dev);
 
 out_free_devname: