sock: use hlist_entry_safe

geliangtang · davem330 · commit 6c59ebd356ff · 2017-01-20T11:38:45.000-05:00
Use hlist_entry_safe() instead of open-coding it.

Signed-off-by: Geliang Tang &lt;geliangtang@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/sock.h b/include/net/sock.h
@@ -544,8 +544,7 @@ static inline struct sock *sk_nulls_head(const struct hlist_nulls_head *head)
 
 static inline struct sock *sk_next(const struct sock *sk)
 {
-	return sk->sk_node.next ?
-		hlist_entry(sk->sk_node.next, struct sock, sk_node) : NULL;
+	return hlist_entry_safe(sk->sk_node.next, struct sock, sk_node);
 }
 
 static inline struct sock *sk_nulls_next(const struct sock *sk)

Original file line number	Diff line number	Diff line change
`@@ -544,8 +544,7 @@ static inline struct sock sk_nulls_head(const struct hlist_nulls_head head)`
`544`	`544`
`545`	`545`	`static inline struct sock sk_next(const struct sock sk)`
`546`	`546`	`{`
`547`		`- return sk->sk_node.next ?`
`548`		`- hlist_entry(sk->sk_node.next, struct sock, sk_node) : NULL;`
	`547`	`+ return hlist_entry_safe(sk->sk_node.next, struct sock, sk_node);`
`549`	`548`	`}`
`550`	`549`
`551`	`550`	`static inline struct sock sk_nulls_next(const struct sock sk)`