From: Bobi Jam <bobijam@gmail.com>
Date: Tue, 11 Dec 2012 03:04:22 +0000 (+0800)
Subject: LU-1484 kernel: pass RHEL5 build for 2.6.18-308
X-Git-Tag: 2.1.4~6
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b873dadb600d1bc2bab3643b74fcbf49d42cd98a;p=fs%2Flustre-release.git

LU-1484 kernel: pass RHEL5 build for 2.6.18-308

For vanilla kernel, proc_dir_entry::deleted and ::pde_users co-exists
from 2.6.23 to 2.6.23.17.

For some RHEL5 kernels, it defines co-existings
proc_dir_entry::deleted and proc_dir_entry_aux::pde_users.

Signed-off-by: Bobi Jam <bobijam@gmail.com>
Change-Id: I107e15e6e7d41680c99b324c35ddac0a7c3716e6
Reviewed-on: http://review.whamcloud.com/4794
Tested-by: Hudson
Reviewed-by: Peng Tao <bergwolf@gmail.com>
Reviewed-by: Stephen Champion <schamp@sgi.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/libcfs/include/libcfs/params_tree.h b/libcfs/include/libcfs/params_tree.h
index 635d6bc..b386413 100644
--- a/libcfs/include/libcfs/params_tree.h
+++ b/libcfs/include/libcfs/params_tree.h
@@ -109,10 +109,6 @@ do {                                    \
 
 #ifdef HAVE_PROCFS_DELETED
 
-#ifdef HAVE_PROCFS_USERS
-#error proc_dir_entry->deleted is conflicted with proc_dir_entry->pde_users
-#endif
-
 static inline
 int LPROCFS_ENTRY_AND_CHECK(struct proc_dir_entry *dp)
 {