Use hlist_unhashed() rather than accessing inside data structure.
Signed-off-by: Akinobu Mita <[email protected]>
CC: "David S. Miller" <[email protected]>
include/linux/list.h | 2 +-
include/net/inet_timewait_sock.h | 2 +-
include/net/sock.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: 2.6-git/include/net/inet_timewait_sock.h
===================================================================
--- 2.6-git.orig/include/net/inet_timewait_sock.h
+++ 2.6-git/include/net/inet_timewait_sock.h
@@ -150,7 +150,7 @@ static inline void inet_twsk_add_bind_no
static inline int inet_twsk_dead_hashed(const struct inet_timewait_sock *tw)
{
- return tw->tw_death_node.pprev != NULL;
+ return !hlist_unhashed(&tw->tw_death_node);
}
static inline void inet_twsk_dead_node_init(struct inet_timewait_sock *tw)
Index: 2.6-git/include/net/sock.h
===================================================================
--- 2.6-git.orig/include/net/sock.h
+++ 2.6-git/include/net/sock.h
@@ -279,7 +279,7 @@ static inline int sk_unhashed(const stru
static inline int sk_hashed(const struct sock *sk)
{
- return sk->sk_node.pprev != NULL;
+ return !sk_unhashed(sk);
}
static __inline__ void sk_node_init(struct hlist_node *node)
Index: 2.6-git/include/linux/list.h
===================================================================
--- 2.6-git.orig/include/linux/list.h
+++ 2.6-git/include/linux/list.h
@@ -619,7 +619,7 @@ static inline void hlist_del_rcu(struct
static inline void hlist_del_init(struct hlist_node *n)
{
- if (n->pprev) {
+ if (!hlist_unhashed(n)) {
__hlist_del(n);
INIT_HLIST_NODE(n);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
