From af7ce1b46466b913214c4458d982e35fee480cc7 Mon Sep 17 00:00:00 2001 From: adilger Date: Mon, 12 Sep 2005 22:47:07 +0000 Subject: [PATCH] Branch b1_4 Compatibility for 2.6.12 kernel. b=6864 --- lustre/include/linux/lustre_compat25.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 28c2092..f7b626c 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -138,6 +138,10 @@ static inline int cleanup_group_info(void) #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) +#define __d_rehash(dentry, lock) d_rehash_cond(dentry, lock) +#endif + #else /* 2.4.. */ #ifdef HAVE_MM_INLINE @@ -218,8 +222,8 @@ static inline void ll_redirty_page(struct page *page) static inline void __d_drop(struct dentry *dentry) { - list_del(&dentry->d_hash); - INIT_LIST_HEAD(&dentry->d_hash); + list_del(&dentry->d_hash); + INIT_LIST_HEAD(&dentry->d_hash); } static inline void lustre_daemonize_helper(void) -- 1.8.3.1