X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flist%2Flist.h;h=0174b90e21b281edf4adba6c8bd7ef3d36b2f3e0;hb=209b10507b8f95f9f549ecb81158034038334c36;hp=6000320da3e38ee1e05f4b7e7298d91599481d97;hpb=e0040f05dd45c84214bfdef5d4c6eacf9586aa7b;p=petitboot

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 = { \