list: unify hlist_add functions
PATCH 1/2 list: unify hlist_add functions
Unify hlist_add_head(), hlist_add_before(), and hlist_add_after().
Signed-off-by Akinobu Mita <[email protected]>
--- include/linux/list.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
include/linux/list.h +17 -16
@@ -588,35 +588,36 @@ static inline void hlist_del_init(struct } } +/* +* This is only for internal hlist manipulation where we know +* the pprev/next entries already! +*/ +static inline void __hlist_add (struct hlist_node *new, +struct hlist_node **pprev,struct hlist_node *next) +{ + new->next = next; +if (next) + next->pprev = &new->next; + *pprev = new; + new->pprev = pprev; +} +static inline void hlist_add_head (struct hlist_node *n,struct hlist_head *h) { -struct hlist_node *first = h->first; - n->next = first; -if (first) - first->pprev = &n->next; - h->first = n; - n->pprev = &h->first; +__hlist_add (n, &h->first, h->first); }/* next must be != NULL */ static inline void hlist_add_before (struct hlist_node *n,struct hlist_node *next) { - n->pprev = next->pprev; - n->next = next; - next->pprev = &n->next; - *(n->pprev) = n; +__hlist_add (n, next->pprev, next); }static inline void hlist_add_after (struct hlist_node *n,struct hlist_node *next) { - next->next = n->next; - n->next = next; - next->pprev = &n->next; - -if (next->next) - next->next->pprev = &next->next; +__hlist_add (next, &n->next, n->next); }/*
PATCH 2/2 list: DEBUG_LIST for hlist
Add sanity checks in hlist manipulation when CONFIG_DEBUG_LIST is enabled.
Signed-off-by Akinobu Mita <[email protected]>
--- include/linux/list.h | 18 ++++++++++++++++++ lib/list_debug.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)
include/linux/list.h +18 -0
@@ -564,6 +564,12 @@ static inline int hlist_empty(const strureturn !h->first; } +#ifdef CONFIG_DEBUG_LIST + +extern void __hlist_del (struct hlist_node *n); + +#else +static inline void __hlist_del (struct hlist_node *n) {struct hlist_node *next = n->next;
@@ -573,6 +579,8 @@ static inline void __hlist_del(struct hl next->pprev = pprev; } +#endif +static inline void hlist_del (struct hlist_node *n) {__hlist_del (n);
@@ -592,6 +600,14 @@ static inline void hlist_del_init(struct* This is only for internal hlist manipulation where we know * the pprev/next entries already! */ + +#ifdef CONFIG_DEBUG_LIST + +extern void __hlist_add (struct hlist_node *new, +struct hlist_node **pprev,struct hlist_node *next); + +#else +static inline void __hlist_add (struct hlist_node *new,struct hlist_node **pprev,struct hlist_node *next) {
@@ -602,6 +618,8 @@ static inline void __hlist_add(struct hl new->pprev = pprev; } +#endif +static inline void hlist_add_head (struct hlist_node *n,struct hlist_head *h) {__hlist_add (n, &h->first, h->first);
lib/list_debug.c +38 -0
@@ -54,3 +54,41 @@ void list_del(struct list_head *entry) entry->prev =LIST_POISON2 ; }EXPORT_SYMBOL (list_del); + +void __hlist_del (struct hlist_node *n) +{ +struct hlist_node *next = n->next; +struct hlist_node **pprev = n->pprev; + +WARN (next && next->pprev != &n->next, +"hlist_del corruption. next->pprev should be %p, but was %p\n" , + &n->next, next->pprev); +WARN (*pprev != n, +"hlist_del corruption. *pprev should be %p, but was %p\n" , + n, *pprev); + + *pprev = next; +if (next) + next->pprev = pprev; +} +EXPORT_SYMBOL (__hlist_del); + +void __hlist_add (struct hlist_node *new, +struct hlist_node **pprev,struct hlist_node *next) +{ +WARN (next && next->pprev != pprev, +"hlist_add corruption. next->pprev should be pprev (%p), " +"but was %p. (next=%p).\n" , + pprev, next->pprev, next); +WARN (*pprev != next, +"hlist_add corruption. *pprev should be next (%p), " +"but was %p. (pprev=%p).\n" , + next, *pprev, pprev); + + new->next = next; +if (next) + next->pprev = &new->next; + *pprev = new; + new->pprev = pprev; +} +EXPORT_SYMBOL (__hlist_add);