summaryrefslogtreecommitdiffstats
path: root/lib/list
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-05-01 13:11:17 +0800
committerGeoff Levand <geoff@infradead.org>2013-05-03 16:20:29 -0700
commit0fad1573c93563fcd62c992d73e9d25161b80076 (patch)
tree35ba12428754665c0ebfcf8d3ff9f605cb491889 /lib/list
parenta51e41eb1d2545b7eb03ff02604225b9594b11e7 (diff)
downloadtalos-petitboot-0fad1573c93563fcd62c992d73e9d25161b80076.tar.gz
talos-petitboot-0fad1573c93563fcd62c992d73e9d25161b80076.zip
lib/list: Fix handling of empty lists
The current list_for_each_entry_safe marco SEGVs on empty lists; the list_entry will give us a NULL tmp on the first iteration. This change removes the use of list_entry, as we're effectively by-passing its NULL return semantics with our own. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Geoff Levand <geoff@infradead.org>
Diffstat (limited to 'lib/list')
-rw-r--r--lib/list/list.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/list/list.h b/lib/list/list.h
index 6000320..0174b90 100644
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -41,11 +41,12 @@ struct list {
for (; _pos; _pos = list_next_entry(_list, _pos, _member))
#define list_for_each_entry_safe(_list, _pos, _tmp, _member) \
- for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member, _list), \
- _tmp = list_entry(_pos->_member.next, typeof(*_pos), _member, _list); \
- _pos; \
- _pos = _tmp, \
- _tmp = _tmp ? list_entry(_tmp->_member.next, typeof(*_pos), _member, _list) : NULL)
+ for (_pos = container_of((_list)->head.next, typeof(*_pos), _member), \
+ _tmp = container_of(_pos->_member.next, typeof(*_pos), \
+ _member); \
+ &_pos->_member != &(_list)->head; \
+ _pos = _tmp, \
+ _tmp = container_of(_tmp->_member.next, typeof(*_pos), _member))
#define DEFINE_LIST(_list) struct list _list = { \
.head = { \
OpenPOWER on IntegriCloud