Rename header file from list.h to xfs_list.h to avoid over products accidentally...

Merge of master-melb:xfs-cmds:27635a by kenmcd.

  Rename list.h to xfs_list.h.

diff --git a/include/Makefile b/include/Makefile
index 2cd523f339e085b9314da2391a90ae5f294b8167..9bda02fbbe5b80d4ffaaf3595383936f90f49140 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -18,14 +18,14 @@
 TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
-HFILES = cache.h handle.h jdm.h libxfs.h libxlog.h list.h parent.h xfs.h xqm.h \
+HFILES = cache.h handle.h jdm.h libxfs.h libxlog.h parent.h xfs.h xqm.h \
        xfs_ag.h xfs_alloc.h xfs_alloc_btree.h xfs_arch.h xfs_attr_leaf.h \
        xfs_attr_sf.h xfs_bit.h xfs_bmap.h xfs_bmap_btree.h xfs_btree.h \
        xfs_buf_item.h xfs_da_btree.h xfs_dfrag.h xfs_dinode.h \
        xfs_dir2.h xfs_dir2_block.h xfs_dir2_data.h xfs_dir2_leaf.h \
        xfs_dir2_node.h xfs_dir2_sf.h xfs_dir_leaf.h xfs_dir_sf.h \
        xfs_extfree_item.h xfs_fs.h xfs_ialloc.h xfs_ialloc_btree.h \
-       xfs_imap.h xfs_inode.h xfs_inode_item.h xfs_inum.h \
+       xfs_imap.h xfs_inode.h xfs_inode_item.h xfs_inum.h xfs_list.h \
        xfs_log.h xfs_log_priv.h xfs_log_recover.h xfs_mount.h xfs_quota.h \
        xfs_rtalloc.h xfs_sb.h xfs_trans.h xfs_trans_space.h xfs_types.h
 

diff --git a/include/libxfs.h b/include/libxfs.h
index f0139449a2d8f645ebfc09a65d35f40d825e271c..e793f717edd9eab17187b2c3412d564582ec8ef6 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -24,7 +24,7 @@
 #include <xfs/platform_defs.h>
 
 #include <pthread.h>
-#include <xfs/list.h>
+#include <xfs/xfs_list.h>
 #include <xfs/cache.h>
 
 #include <xfs/xfs_fs.h>

diff --git a/include/list.h b/include/list.h
index 3ba491d323237008c8dbd1ae1f14983d65c9c8a9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/include/list.h
+++ b/include/list.h
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2006 Silicon Graphics, Inc.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#ifndef __LIST_H__
-#define __LIST_H__
-
-/*
- * Simple, generic doubly-linked list implementation.
- */
-
-struct list_head {
-       struct list_head *next;
-       struct list_head *prev;
-};
-
-static inline void list_head_init(struct list_head *list)
-{
-       list->next = list->prev = list;
-}
-
-static inline void list_head_destroy(struct list_head *list)
-{
-       list->next = list->prev = NULL;
-}
-
-static inline void __list_add(struct list_head *add,
-                             struct list_head *prev, struct list_head *next)
-{
-       next->prev = add;
-       add->next = next;
-       add->prev = prev;
-       prev->next = add;
-}
-
-static inline void list_add(struct list_head *add, struct list_head *head)
-{
-       __list_add(add, head, head->next);
-}
-
-static inline void list_add_tail(struct list_head *add, struct list_head *head)
-{
-       __list_add(add, head->prev, head);
-}
-
-static inline void __list_del(struct list_head *prev, struct list_head *next)
-{
-       next->prev = prev;
-       prev->next = next;
-}
-
-static inline void list_del_init(struct list_head *entry)
-{
-       __list_del(entry->prev, entry->next);
-       list_head_init(entry);
-}
-
-static inline void list_move(struct list_head *list, struct list_head *head)
-{
-       __list_del(list->prev, list->next);
-       list_add(list, head);
-}
-
-static inline void list_move_tail(struct list_head *list, struct list_head *head)
-{
-       __list_del(list->prev, list->next);
-       list_add_tail(list, head);
-}
-
-static inline int list_empty(const struct list_head *head)
-{
-       return head->next == head;
-}
-
-#endif /* __LIST_H__ */

diff --git a/include/xfs_list.h b/include/xfs_list.h
new file mode 100644 (file)
index 0000000..3ba491d
--- /dev/null
+++ b/include/xfs_list.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2006 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#ifndef __LIST_H__
+#define __LIST_H__
+
+/*
+ * Simple, generic doubly-linked list implementation.
+ */
+
+struct list_head {
+       struct list_head *next;
+       struct list_head *prev;
+};
+
+static inline void list_head_init(struct list_head *list)
+{
+       list->next = list->prev = list;
+}
+
+static inline void list_head_destroy(struct list_head *list)
+{
+       list->next = list->prev = NULL;
+}
+
+static inline void __list_add(struct list_head *add,
+                             struct list_head *prev, struct list_head *next)
+{
+       next->prev = add;
+       add->next = next;
+       add->prev = prev;
+       prev->next = add;
+}
+
+static inline void list_add(struct list_head *add, struct list_head *head)
+{
+       __list_add(add, head, head->next);
+}
+
+static inline void list_add_tail(struct list_head *add, struct list_head *head)
+{
+       __list_add(add, head->prev, head);
+}
+
+static inline void __list_del(struct list_head *prev, struct list_head *next)
+{
+       next->prev = prev;
+       prev->next = next;
+}
+
+static inline void list_del_init(struct list_head *entry)
+{
+       __list_del(entry->prev, entry->next);
+       list_head_init(entry);
+}
+
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+       __list_del(list->prev, list->next);
+       list_add(list, head);
+}
+
+static inline void list_move_tail(struct list_head *list, struct list_head *head)
+{
+       __list_del(list->prev, list->next);
+       list_add_tail(list, head);
+}
+
+static inline int list_empty(const struct list_head *head)
+{
+       return head->next == head;
+}
+
+#endif /* __LIST_H__ */

diff --git a/libxfs/cache.c b/libxfs/cache.c
index 1a844671b92dd3a74ddf93d55d4069318fbc0ab5..3c48e7eb56f997f957e98bff950fcad092f15b88 100644 (file)
--- a/libxfs/cache.c
+++ b/libxfs/cache.c
@@ -23,7 +23,7 @@
 #include <pthread.h>
 
 #include <xfs/platform_defs.h>
-#include <xfs/list.h>
+#include <xfs/xfs_list.h>
 #include <xfs/cache.h>
 
 #define CACHE_DEBUG 1