X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=flist.h;h=5437cd80da85ab7581b2282f52669510ef682d20;hp=8e1304142cc3d3468b79f75872e534220626ce59;hb=839bea4f8e8f6cd00fb69028ae7a007643b53242;hpb=1ae83d45ed853cd73b95b89ae14cacac5b97187e

diff --git a/flist.h b/flist.h
index 8e130414..5437cd80 100644
--- a/flist.h
+++ b/flist.h
@@ -2,16 +2,10 @@
 #define _LINUX_FLIST_H
 
 #include <stdlib.h>
+#include <stddef.h>
 
-#undef offsetof
-#ifdef __compiler_offsetof
-#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
-#else
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+#define container_of(ptr, type, member)  ({			\
+	const __typeof__( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
 /*
@@ -140,6 +134,22 @@ static inline void flist_splice(const struct flist_head *list,
 		__flist_splice(list, head, head->next);
 }
 
+static inline void flist_splice_tail(struct flist_head *list,
+				     struct flist_head *head)
+{
+	if (!flist_empty(list))
+		__flist_splice(list, head->prev, head);
+}
+
+static inline void flist_splice_tail_init(struct flist_head *list,
+					  struct flist_head *head)
+{
+	if (!flist_empty(list)) {
+		__flist_splice(list, head->prev, head);
+		INIT_FLIST_HEAD(list);
+	}
+}
+
 static inline void flist_splice_init(struct flist_head *list,
 				    struct flist_head *head)
 {
@@ -158,6 +168,12 @@ static inline void flist_splice_init(struct flist_head *list,
 #define flist_entry(ptr, type, member) \
 	container_of(ptr, type, member)
 
+#define flist_first_entry(ptr, type, member) \
+	flist_entry((ptr)->next, type, member)
+
+#define flist_last_entry(ptr, type, member) \
+	flist_entry((ptr)->prev, type, member)
+
 /**
  * flist_for_each	-	iterate over a list
  * @pos:	the &struct flist_head to use as a loop counter.