From: David S. Miller <davem@davemloft.net>
Date: Mon, 29 Jan 2018 15:14:59 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.16-rc1~123^2~29
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3e3ab9ccca5b50b11bd4d16c2048b667343354bd;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>
---

3e3ab9ccca5b50b11bd4d16c2048b667343354bd
diff --cc include/net/net_namespace.h
index f8a84a2c2341,049008493faf..f306b2aa15a4
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@@ -223,6 -223,11 +223,11 @@@ int net_eq(const struct net *net1, cons
  	return net1 == net2;
  }
  
+ static inline int check_net(const struct net *net)
+ {
 -	return atomic_read(&net->count) != 0;
++	return refcount_read(&net->count) != 0;
+ }
+ 
  void net_drop_ns(void *);
  
  #else