diff options
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/Makefile.am | 6 | ||||
| -rw-r--r-- | libglusterfs/src/list.h | 23 | 
2 files changed, 27 insertions, 2 deletions
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 2441023ad39..818de91cf36 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -30,7 +30,8 @@ libglusterfs_la_SOURCES = dict.c xlator.c logging.c \  	$(CONTRIBDIR)/libgen/basename_r.c $(CONTRIBDIR)/libgen/dirname_r.c \  	$(CONTRIBDIR)/stdlib/gf_mkostemp.c strfd.c parse-utils.c \  	$(CONTRIBDIR)/mount/mntent.c $(CONTRIBDIR)/libexecinfo/execinfo.c\ -	quota-common-utils.c rot-buffs.c +	quota-common-utils.c rot-buffs.c $(CONTRIBDIR)/timer-wheel/timer-wheel.c \ +        $(CONTRIBDIR)/timer-wheel/find_last_bit.c  nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c @@ -49,7 +50,8 @@ noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h timespec.  	template-component-messages.h strfd.h syncop-utils.h parse-utils.h \  	$(CONTRIBDIR)/mount/mntent_compat.h lvm-defaults.h \  	$(CONTRIBDIR)/libexecinfo/execinfo_compat.h \ -	unittest/unittest.h quota-common-utils.h rot-buffs.h +	unittest/unittest.h quota-common-utils.h rot-buffs.h \ +	$(CONTRIBDIR)/timer-wheel/timer-wheel.h  EXTRA_DIST = graph.l graph.y diff --git a/libglusterfs/src/list.h b/libglusterfs/src/list.h index 894fa3012cf..a860275a91e 100644 --- a/libglusterfs/src/list.h +++ b/libglusterfs/src/list.h @@ -191,6 +191,29 @@ list_is_singular(struct list_head *head)          return !list_empty(head) && (head->next == head->prev);  } +/** + * list_replace - replace old entry by new one + * @old : the element to be replaced + * @new : the new element to insert + * + * If @old was empty, it will be overwritten. + */ +static inline void list_replace(struct list_head *old, +				struct list_head *new) +{ +	new->next = old->next; +	new->next->prev = new; +	new->prev = old->prev; +	new->prev->next = new; +} + +static inline void list_replace_init(struct list_head *old, +                                     struct list_head *new) +{ +	list_replace(old, new); +	INIT_LIST_HEAD(old); +} +  #define list_entry(ptr, type, member)					\  	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))  | 
