X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Frtnetlink.c;h=e1ba26fb4bf28052fd0150f08ed5d6eaa057fa19;hb=a2508c0814c6d2c0259fa859a6184343b1e39ea3;hp=1072d16696c3b651993ef7130bd09a475c072b81;hpb=4d5709a7b7d54fc5882d2943a14988a92d48c00a;p=linux-2.6-omap-h63xx.git diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 1072d16696c..e1ba26fb4bf 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -742,12 +742,12 @@ static struct net *get_net_ns_by_pid(pid_t pid) /* Lookup the network namespace */ net = ERR_PTR(-ESRCH); rcu_read_lock(); - tsk = find_task_by_pid(pid); + tsk = find_task_by_vpid(pid); if (tsk) { - task_lock(tsk); - if (tsk->nsproxy) - net = get_net(tsk->nsproxy->net_ns); - task_unlock(tsk); + struct nsproxy *nsproxy; + nsproxy = task_nsproxy(tsk); + if (nsproxy) + net = get_net(nsproxy->net_ns); } rcu_read_unlock(); return net;