From: David Chatterton Date: Tue, 5 Dec 2006 14:35:37 +0000 (+0000) Subject: Rename header file from list.h to xfs_list.h to avoid over products accidentally... X-Git-Tag: v2.9.0~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f474247260d5f235b4b876063e10e62643566c;p=thirdparty%2Fxfsprogs-dev.git Rename header file from list.h to xfs_list.h to avoid over products accidentally using it. 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 2cd523f33..9bda02fbb 100644 --- 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 f0139449a..e793f717e 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/include/list.h b/include/list.h index 3ba491d32..e69de29bb 100644 --- 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 index 000000000..3ba491d32 --- /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 1a844671b..3c48e7eb5 100644 --- a/libxfs/cache.c +++ b/libxfs/cache.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #define CACHE_DEBUG 1