[NET]: Do not let GCC reload pointers after NULL checks.

c1f25dc7 · David S. Miller · Arnaldo Carvalho de Melo · 43062f4f · c1f25dc7
Commit c1f25dc7 authored Apr 22, 2003 by David S. Miller Committed by Arnaldo Carvalho de Melo Apr 22, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

net/socket.c net/socket.c +9 -4

No files found.
--- a/net/socket.c
+++ b/net/socket.c
@@ -149,10 +149,12 @@ static __inline__ void net_family_bug(int family)

 int net_family_get(int family)
 {
+	struct net_proto_family *prot = net_families[family];
 	int rc = 1;

-	if (likely(net_families[family] != NULL))
-		rc = try_module_get(net_families[family]->owner);
+	barrier();
+	if (likely(prot != NULL))
+		rc = try_module_get(prot->owner);
 	else
 		net_family_bug(family);
 	return rc;
@@ -160,8 +162,11 @@ int net_family_get(int family)

 void net_family_put(int family)
 {
-	if (likely(net_families[family] != NULL))
-		module_put(net_families[family]->owner);
+	struct net_proto_family *prot = net_families[family];
+
+	barrier();
+	if (likely(prot != NULL))
+		module_put(prot->owner);
 	else
 		net_family_bug(family);
 }