Merge remote-tracking branch 'upstream/master'

Conflicts:
	xlators/mgmt/glusterd/src/Makefile.am

Change-Id: Ida5ec4aecc358cb2268bdfdb1a8c9bab750f9575

1 files changed, 15 insertions, 0 deletions

diff --git a/libglusterfs/src/list.h b/libglusterfs/src/list.h
index 6fcf17f35..c9a2fb070 100644
--- a/libglusterfs/src/list.h
+++ b/libglusterfs/src/list.h
@@ -46,6 +46,21 @@ list_add_tail (struct list_head *new, struct list_head *head)
 
 
 static inline void
+list_add_order (struct list_head *new, struct list_head *head,
+                int (*compare)(struct list_head *, struct list_head *))
+{
+        struct list_head *pos = head->next;
+
+        while ( pos != head ) {
+                if (compare(new, pos) <= 0)
+                        break;
+                pos = pos->next;
+        }
+
+        list_add_tail(new, pos);
+}
+
+static inline void
 list_del (struct list_head *old)
 {
 	old->prev->next = old->next;