From f15380985042146cdc112588c369f5eeb7f57dad Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 22 Oct 2003 10:59:35 +0000 Subject: [PATCH] - listman patches against all supported series - hlist defines removed from lustre_compat25.h --- lustre/kernel_patches/patches/listman-2.4.18.patch | 21 +++++++++++++++++++++ lustre/kernel_patches/patches/listman-2.4.20.patch | 22 ++++++++++++++++++++++ lustre/kernel_patches/series/hp-pnnl-2.4.20 | 1 + lustre/kernel_patches/series/rh-2.4.20 | 1 + lustre/kernel_patches/series/rh-2.4.22 | 1 + 5 files changed, 46 insertions(+) create mode 100644 lustre/kernel_patches/patches/listman-2.4.18.patch create mode 100644 lustre/kernel_patches/patches/listman-2.4.20.patch diff --git a/lustre/kernel_patches/patches/listman-2.4.18.patch b/lustre/kernel_patches/patches/listman-2.4.18.patch new file mode 100644 index 0000000..37535c09 --- /dev/null +++ b/lustre/kernel_patches/patches/listman-2.4.18.patch @@ -0,0 +1,21 @@ +Index: linux-2.4.18-chaos/include/linux/list.h +=================================================================== +--- linux-2.4.18-chaos.orig/include/linux/list.h 2003-10-22 13:43:39.000000000 +0400 ++++ linux-2.4.18-chaos/include/linux/list.h 2003-10-22 13:44:17.000000000 +0400 +@@ -173,6 +173,16 @@ + for (pos = (head)->prev, prefetch(pos->prev); pos != (head); \ + pos = pos->prev, prefetch(pos->prev)) + ++/* 2.5 uses hlists for some things, like the d_hash. we'll treat them ++ * as 2.5 and let macros drop back.. */ ++#define hlist_entry list_entry ++#define hlist_head list_head ++#define hlist_node list_head ++#define HLIST_HEAD LIST_HEAD ++#define INIT_HLIST_HEAD INIT_LIST_HEAD ++#define hlist_del_init list_del_init ++#define hlist_add_head list_add ++#define hlist_for_each_safe list_for_each_safe + + #endif /* __KERNEL__ || _LVM_H_INCLUDE */ + diff --git a/lustre/kernel_patches/patches/listman-2.4.20.patch b/lustre/kernel_patches/patches/listman-2.4.20.patch new file mode 100644 index 0000000..1e4508b --- /dev/null +++ b/lustre/kernel_patches/patches/listman-2.4.20.patch @@ -0,0 +1,22 @@ +Index: linux-2.4.20/include/linux/list.h +=================================================================== +--- linux-2.4.20.orig/include/linux/list.h 2003-10-17 23:56:26.000000000 +0400 ++++ linux-2.4.20/include/linux/list.h 2003-10-22 14:02:22.000000000 +0400 +@@ -227,6 +227,17 @@ + pos = list_entry(pos->member.next, typeof(*pos), member), \ + prefetch(pos->member.next)) + ++/* 2.5 uses hlists for some things, like the d_hash. we'll treat them ++ * as 2.5 and let macros drop back.. */ ++#define hlist_entry list_entry ++#define hlist_head list_head ++#define hlist_node list_head ++#define HLIST_HEAD LIST_HEAD ++#define INIT_HLIST_HEAD INIT_LIST_HEAD ++#define hlist_del_init list_del_init ++#define hlist_add_head list_add ++#define hlist_for_each_safe list_for_each_safe ++ + #endif /* __KERNEL__ || _LVM_H_INCLUDE */ + + #endif diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20 b/lustre/kernel_patches/series/hp-pnnl-2.4.20 index cc4e358..49541ef 100644 --- a/lustre/kernel_patches/series/hp-pnnl-2.4.20 +++ b/lustre/kernel_patches/series/hp-pnnl-2.4.20 @@ -33,3 +33,4 @@ jbd-flushtime.patch jbd-get_write_access.patch nfs_export_kernel-2.4.20-hp.patch ext3-ea-in-inode-2.4.20.patch +listman-2.4.20.patch diff --git a/lustre/kernel_patches/series/rh-2.4.20 b/lustre/kernel_patches/series/rh-2.4.20 index 4c9ac1b..1766080 100644 --- a/lustre/kernel_patches/series/rh-2.4.20 +++ b/lustre/kernel_patches/series/rh-2.4.20 @@ -36,3 +36,4 @@ jbd-flushtime.patch jbd-get_write_access.patch nfs_export_kernel-2.4.20-rh.patch ext3-ea-in-inode-2.4.20.patch +listman-2.4.20.patch diff --git a/lustre/kernel_patches/series/rh-2.4.22 b/lustre/kernel_patches/series/rh-2.4.22 index c0b16a3..e56c236 100644 --- a/lustre/kernel_patches/series/rh-2.4.22 +++ b/lustre/kernel_patches/series/rh-2.4.22 @@ -23,3 +23,4 @@ add_page_private.patch socket-exports-2.4.22-rh.patch nfs_export_kernel-2.4.22-rh.patch ext3-ea-in-inode-2.4.22-rh.patch +listman-2.4.20.patch -- 1.8.3.1