[Pkg-lustre-svn-commit] updated: [6776c07] Update patches to do not fail on 1.6.6
Patrick Winnertz
winnie at debian.org
Tue Dec 2 14:54:03 UTC 2008
The following commit has been merged in the master branch:
commit 6776c070737f66b72f073f7ac5de98c546bc1818
Author: Patrick Winnertz <winnie at debian.org>
Date: Wed Nov 26 13:06:55 2008 +0100
Update patches to do not fail on 1.6.6
diff --git a/debian/patches/enable-quota.dpatch b/debian/patches/enable-quota.dpatch
index d5c8160..ec1cfe4 100755
--- a/debian/patches/enable-quota.dpatch
+++ b/debian/patches/enable-quota.dpatch
@@ -4,9 +4,9 @@
## DP: --enable-quota check was only run when building modules.
@DPATCH@
-diff -urNad lustre-1.6.4.2~/configure.ac lustre-1.6.4.2/configure.ac
---- lustre-1.6.4.2~/configure.ac 2007-11-29 17:07:35.000000000 +0100
-+++ lustre-1.6.4.2/configure.ac 2008-02-12 19:12:13.593610439 +0100
+diff -urNad lustre-1.6.6~/configure.ac lustre-1.6.6/configure.ac
+--- lustre-1.6.6~/configure.ac 2008-11-26 12:52:35.000000000 +0100
++++ lustre-1.6.6/configure.ac 2008-11-26 12:52:44.000000000 +0100
@@ -8,6 +8,7 @@
LB_CHECK_VERSION
@@ -15,16 +15,24 @@ diff -urNad lustre-1.6.4.2~/configure.ac lustre-1.6.4.2/configure.ac
AC_CANONICAL_SYSTEM
-diff -urNad lustre-1.6.4.2~/lustre/autoconf/lustre-core.m4 lustre-1.6.4.2/lustre/autoconf/lustre-core.m4
---- lustre-1.6.4.2~/lustre/autoconf/lustre-core.m4 2007-12-04 23:03:50.000000000 +0100
-+++ lustre-1.6.4.2/lustre/autoconf/lustre-core.m4 2008-02-12 19:12:40.986431493 +0100
-@@ -1374,9 +1374,6 @@
- [enable quota support]),
- [],[enable_quota='yes'])
- AC_MSG_RESULT([$enable_quota])
+diff -urNad lustre-1.6.6~/lustre/autoconf/lustre-core.m4 lustre-1.6.6/lustre/autoconf/lustre-core.m4
+--- lustre-1.6.6~/lustre/autoconf/lustre-core.m4 2008-11-26 12:52:44.000000000 +0100
++++ lustre-1.6.6/lustre/autoconf/lustre-core.m4 2008-11-26 13:04:55.000000000 +0100
+@@ -1676,9 +1676,6 @@
+ AC_HELP_STRING([--enable-quota],
+ [enable quota support]),
+ [],[enable_quota='default'])
-if test x$linux25 != xyes; then
-- enable_quota='no'
+- enable_quota='no'
-fi
- if test x$enable_quota != xno; then
- AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support])
- fi
+ LB_LINUX_CONFIG([QUOTA],[
+ if test x$enable_quota = xdefault; then
+ enable_quota='yes'
+@@ -1715,6 +1712,7 @@
+ ])
+ ])
+
++
+ #
+ # LC_COOKIE_FOLLOW_LINK
+ #
diff --git a/debian/patches/patchless_support_2.6.24_configure_part.dpatch b/debian/patches/patchless_support_2.6.24_configure_part.dpatch
index fae813b..8cce361 100755
--- a/debian/patches/patchless_support_2.6.24_configure_part.dpatch
+++ b/debian/patches/patchless_support_2.6.24_configure_part.dpatch
@@ -5,32 +5,27 @@
## DP: Patch which will enable 2.6.24 patchless support for lustre, taken from #14250
@DPATCH@
-Index: lustre/autoconf/lustre-core.m4
-===================================================================
-RCS file: /cvsroot/cfs/lustre-core/autoconf/lustre-core.m4,v
-retrieving revision 1.23.2.31.2.5.2.19
-diff -u -p -r1.23.2.31.2.5.2.19 lustre-core.m4
---- ./lustre/autoconf/lustre-core.m4 13 Nov 2008 08:09:17 -0000 1.23.2.31.2.5.2.19
-+++ ./lustre/autoconf/lustre-core.m4 25 Nov 2008 09:20:00 -0000
-@@ -1151,15 +1151,20 @@ LB_LINUX_TRY_COMPILE([
+diff -urNad lustre-1.6.6~/lustre/autoconf/lustre-core.m4 lustre-1.6.6/lustre/autoconf/lustre-core.m4
+--- lustre-1.6.6~/lustre/autoconf/lustre-core.m4 2008-11-26 12:46:12.000000000 +0100
++++ lustre-1.6.6/lustre/autoconf/lustre-core.m4 2008-11-26 12:46:28.000000000 +0100
+@@ -1109,15 +1109,20 @@
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
LB_LINUX_TRY_COMPILE([
- #include <linux/mm.h>
- #include <linux/page-flags.h>
--],[
++ #include <linux/autoconf.h>
++#ifdef HAVE_LINUX_MMTYPES_H
++ #include <linux/mm_types.h>
++#endif
++ #include <linux/page-flags.h>
+ ],[
- #ifndef PageChecked
- #error PageChecked not defined in kernel
- #endif
- #ifndef SetPageChecked
- #error SetPageChecked not defined in kernel
- #endif
-+ #include <linux/autoconf.h>
-+#ifdef HAVE_LINUX_MMTYPES_H
-+ #include <linux/mm_types.h>
-+#endif
-+ #include <linux/page-flags.h>
-+],[
+ struct page *p;
+
+ /* before 2.6.26 this define*/
@@ -42,7 +37,7 @@ diff -u -p -r1.23.2.31.2.5.2.19 lustre-core.m4
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PAGE_CHECKED, 1,
-@@ -1365,11 +1370,149 @@ LB_LINUX_TRY_COMPILE([
+@@ -1271,11 +1276,149 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -197,7 +192,7 @@ diff -u -p -r1.23.2.31.2.5.2.19 lustre-core.m4
])
#
-@@ -1480,6 +1623,19 @@ AC_DEFUN([LC_PROG_LINUX],
+@@ -1377,6 +1520,19 @@
LC_UNREGISTER_BLKDEV_RETURN_INT
LC_KERNEL_SPLICE_READ
LC_HAVE_EXPORTFS_H
@@ -217,7 +212,7 @@ diff -u -p -r1.23.2.31.2.5.2.19 lustre-core.m4
])
#
-@@ -1712,6 +1868,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1609,6 +1765,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -225,14 +220,10 @@ diff -u -p -r1.23.2.31.2.5.2.19 lustre-core.m4
],[
AC_MSG_RESULT([no])
])
-Index: lustre/include/linux/lustre_compat25.h
-===================================================================
-RCS file: /cvsroot/cfs/lustre-core/include/linux/lustre_compat25.h,v
-retrieving revision 1.31.16.7.4.2.2.10
-diff -u -p -r1.31.16.7.4.2.2.10 lustre_compat25.h
---- ./lustre/include/linux/lustre_compat25.h 11 Nov 2008 07:43:23 -0000 1.31.16.7.4.2.2.10
-+++ ./lustre/include/linux/lustre_compat25.h 25 Nov 2008 09:20:00 -0000
-@@ -57,6 +57,28 @@ struct ll_iattr_struct {
+diff -urNad lustre-1.6.6~/lustre/include/linux/lustre_compat25.h lustre-1.6.6/lustre/include/linux/lustre_compat25.h
+--- lustre-1.6.6~/lustre/include/linux/lustre_compat25.h 2008-11-26 12:46:12.000000000 +0100
++++ lustre-1.6.6/lustre/include/linux/lustre_compat25.h 2008-11-26 12:50:19.000000000 +0100
+@@ -57,6 +57,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
#ifndef HAVE_SET_FS_PWD
@@ -261,7 +252,7 @@ diff -u -p -r1.31.16.7.4.2.2.10 lustre_compat25.h
static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
struct dentry *dentry)
{
-@@ -75,6 +97,7 @@ static inline void ll_set_fs_pwd(struct
+@@ -75,6 +97,7 @@
mntput(old_pwdmnt);
}
}
@@ -269,10 +260,11 @@ diff -u -p -r1.31.16.7.4.2.2.10 lustre_compat25.h
#else
#define ll_set_fs_pwd set_fs_pwd
#endif /* HAVE_SET_FS_PWD */
-@@ -445,6 +468,57 @@ int ll_unregister_blkdev(unsigned int de
- #define cpu_to_node(cpu) 0
+@@ -554,6 +577,59 @@
+ }
#endif
++//Not Sure if this part is really needed .... patch from HEAD
+#ifdef HAVE_REGISTER_SHRINKER
+typedef int (*shrinker_t)(int nr_to_scan, gfp_t gfp_mask);
+
@@ -323,20 +315,17 @@ diff -u -p -r1.31.16.7.4.2.2.10 lustre_compat25.h
+#ifndef list_for_each_safe_rcu
+#define list_for_each_safe_rcu(a,b,c) list_for_each_rcu(b, c)
+#endif
++//Unsure Part ends here :)
+
- #ifndef abs
- static inline int abs(int x)
- {
-Index: lustre/llite/symlink.c
-===================================================================
-RCS file: /cvsroot/cfs/lustre-core/llite/symlink.c,v
-retrieving revision 1.41.34.4.14.7
-diff -u -p -r1.41.34.4.14.7 symlink.c
---- ./lustre/llite/symlink.c 25 Nov 2008 03:12:50 -0000 1.41.34.4.14.7
-+++ ./lustre/llite/symlink.c 25 Nov 2008 09:20:00 -0000
-@@ -177,8 +177,12 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_fol
- up(&lli->lli_size_sem);
- }
+ #ifdef HAVE_INVALIDATE_BDEV_2ARG
+ #define ll_invalidate_bdev(a,b) invalidate_bdev((a),(b))
+ #else
+diff -urNad lustre-1.6.6~/lustre/llite/symlink.c lustre-1.6.6/lustre/llite/symlink.c
+--- lustre-1.6.6~/lustre/llite/symlink.c 2008-11-26 12:46:12.000000000 +0100
++++ lustre-1.6.6/lustre/llite/symlink.c 2008-11-26 12:46:28.000000000 +0100
+@@ -171,8 +171,12 @@
+ rc = ll_readlink_internal(inode, &request, &symname);
+ up(&lli->lli_size_sem);
if (rc) {
+#ifdef HAVE_PATH_RELEASE
path_release(nd); /* Kernel assumes that ->follow_link()
@@ -347,14 +336,10 @@ diff -u -p -r1.41.34.4.14.7 symlink.c
GOTO(out, rc);
}
-Index: lustre/lvfs/lvfs_linux.c
-===================================================================
-RCS file: /cvsroot/cfs/lustre-core/lvfs/lvfs_linux.c,v
-retrieving revision 1.30.18.2.14.4
-diff -u -p -r1.30.18.2.14.4 lvfs_linux.c
---- ./lustre/lvfs/lvfs_linux.c 9 Oct 2008 11:45:23 -0000 1.30.18.2.14.4
-+++ ./lustre/lvfs/lvfs_linux.c 25 Nov 2008 09:20:00 -0000
-@@ -148,10 +148,10 @@ void push_ctxt(struct lvfs_run_ctxt *sav
+diff -urNad lustre-1.6.6~/lustre/lvfs/lvfs_linux.c lustre-1.6.6/lustre/lvfs/lvfs_linux.c
+--- lustre-1.6.6~/lustre/lvfs/lvfs_linux.c 2008-11-26 12:46:12.000000000 +0100
++++ lustre-1.6.6/lustre/lvfs/lvfs_linux.c 2008-11-26 12:46:28.000000000 +0100
+@@ -148,10 +148,10 @@
*/
save->fs = get_fs();
@@ -368,7 +353,7 @@ diff -u -p -r1.30.18.2.14.4 lvfs_linux.c
save->luc.luc_umask = current->fs->umask;
LASSERT(save->pwd);
-@@ -205,10 +205,10 @@ void pop_ctxt(struct lvfs_run_ctxt *save
+@@ -205,10 +205,10 @@
atomic_read(¤t->fs->pwdmnt->mnt_count));
*/
@@ -383,14 +368,10 @@ diff -u -p -r1.30.18.2.14.4 lvfs_linux.c
set_fs(saved->fs);
ll_set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd);
-Index: lustre/mgc/mgc_request.c
-===================================================================
-RCS file: /cvsroot/cfs/lustre-core/mgc/mgc_request.c,v
-retrieving revision 1.5.6.14.4.2.2.9
-diff -u -p -r1.5.6.14.4.2.2.9 mgc_request.c
---- ./lustre/mgc/mgc_request.c 11 Nov 2008 07:44:16 -0000 1.5.6.14.4.2.2.9
-+++ ./lustre/mgc/mgc_request.c 25 Nov 2008 09:20:00 -0000
-@@ -415,7 +415,7 @@ static int mgc_fs_setup(struct obd_devic
+diff -urNad lustre-1.6.6~/lustre/mgc/mgc_request.c lustre-1.6.6/lustre/mgc/mgc_request.c
+--- lustre-1.6.6~/lustre/mgc/mgc_request.c 2008-11-26 12:46:12.000000000 +0100
++++ lustre-1.6.6/lustre/mgc/mgc_request.c 2008-11-26 12:46:28.000000000 +0100
+@@ -410,7 +410,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
@@ -399,14 +380,10 @@ diff -u -p -r1.5.6.14.4.2.2.9 mgc_request.c
strlen(MOUNT_CONFIGS_DIR));
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (IS_ERR(dentry)) {
-Index: lustre/ptlrpc/service.c
-===================================================================
-RCS file: /cvsroot/cfs/lustre-core/ptlrpc/service.c,v
-retrieving revision 1.114.30.25.2.1.2.17
-diff -u -p -r1.114.30.25.2.1.2.17 service.c
---- ./lustre/ptlrpc/service.c 24 Nov 2008 13:34:41 -0000 1.114.30.25.2.1.2.17
-+++ ./lustre/ptlrpc/service.c 25 Nov 2008 09:20:00 -0000
-@@ -1501,7 +1501,7 @@ void ptlrpc_daemonize(char *name)
+diff -urNad lustre-1.6.6~/lustre/ptlrpc/service.c lustre-1.6.6/lustre/ptlrpc/service.c
+--- lustre-1.6.6~/lustre/ptlrpc/service.c 2008-11-26 12:46:12.000000000 +0100
++++ lustre-1.6.6/lustre/ptlrpc/service.c 2008-11-26 12:46:28.000000000 +0100
+@@ -1268,7 +1268,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
current->fs = fs;
diff --git a/debian/patches/patchless_support_2.6.24_lnet_part.dpatch b/debian/patches/patchless_support_2.6.24_lnet_part.dpatch
index cdd8dbe..c5a9a98 100755
--- a/debian/patches/patchless_support_2.6.24_lnet_part.dpatch
+++ b/debian/patches/patchless_support_2.6.24_lnet_part.dpatch
@@ -5,10 +5,10 @@
## DP: Patch which will enable 2.6.24 patchless support for lustre, taken from #14250
@DPATCH@
-diff -u -p -r1.51.2.10 lustre-lnet.m4
---- ./lnet/autoconf/lustre-lnet.m4 17 Oct 2008 21:42:10 -0000 1.51.2.10
-+++ ./lnet/autoconf/lustre-lnet.m4 17 Nov 2008 07:03:41 -0000
-@@ -1290,6 +1290,58 @@ LB_LINUX_TRY_COMPILE([
+diff -urNad lustre-1.6.6~/lnet/autoconf/lustre-lnet.m4 lustre-1.6.6/lnet/autoconf/lustre-lnet.m4
+--- lustre-1.6.6~/lnet/autoconf/lustre-lnet.m4 2008-09-03 11:16:27.000000000 +0200
++++ lustre-1.6.6/lnet/autoconf/lustre-lnet.m4 2008-11-26 12:24:08.000000000 +0100
+@@ -1290,6 +1290,58 @@
])
])
@@ -67,7 +67,7 @@ diff -u -p -r1.51.2.10 lustre-lnet.m4
#
# LN_PROG_LINUX
#
-@@ -1333,6 +1385,11 @@ LN_2ARGS_REGISTER_SYSCTL
+@@ -1333,6 +1385,11 @@
LN_KMEM_CACHE
# 2.6.23
LN_KMEM_CACHE_CREATE_DTOR
@@ -79,14 +79,10 @@ diff -u -p -r1.51.2.10 lustre-lnet.m4
])
#
-Index: lnet/include/libcfs/linux/kp30.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/include/libcfs/linux/Attic/kp30.h,v
-retrieving revision 1.15.2.4
-diff -u -p -r1.15.2.4 kp30.h
---- ./lnet/include/libcfs/linux/kp30.h 7 Aug 2008 09:50:09 -0000 1.15.2.4
-+++ ./lnet/include/libcfs/linux/kp30.h 17 Nov 2008 07:03:41 -0000
-@@ -142,6 +142,12 @@ static inline void our_cond_resched(void
+diff -urNad lustre-1.6.6~/lnet/include/libcfs/linux/kp30.h lustre-1.6.6/lnet/include/libcfs/linux/kp30.h
+--- lustre-1.6.6~/lnet/include/libcfs/linux/kp30.h 2008-08-07 12:23:36.000000000 +0200
++++ lustre-1.6.6/lnet/include/libcfs/linux/kp30.h 2008-11-26 12:24:08.000000000 +0100
+@@ -142,6 +142,12 @@
#endif
#define LASSERT_SEM_LOCKED(sem) LASSERT(down_trylock(sem) != 0)
@@ -99,14 +95,10 @@ diff -u -p -r1.15.2.4 kp30.h
#define LIBCFS_PANIC(msg) panic(msg)
/* ------------------------------------------------------------------- */
-Index: lnet/include/libcfs/linux/linux-prim.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/include/libcfs/linux/Attic/linux-prim.h,v
-retrieving revision 1.10.6.2
-diff -u -p -r1.10.6.2 linux-prim.h
---- ./lnet/include/libcfs/linux/linux-prim.h 7 Aug 2008 09:50:09 -0000 1.10.6.2
-+++ ./lnet/include/libcfs/linux/linux-prim.h 17 Nov 2008 07:03:41 -0000
-@@ -84,6 +84,17 @@ typedef struct ctl_table_header cfs_sys
+diff -urNad lustre-1.6.6~/lnet/include/libcfs/linux/linux-prim.h lustre-1.6.6/lnet/include/libcfs/linux/linux-prim.h
+--- lustre-1.6.6~/lnet/include/libcfs/linux/linux-prim.h 2008-08-07 12:23:36.000000000 +0200
++++ lustre-1.6.6/lnet/include/libcfs/linux/linux-prim.h 2008-11-26 12:24:08.000000000 +0100
+@@ -84,6 +84,17 @@
#endif
#define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t)
@@ -124,13 +116,9 @@ diff -u -p -r1.10.6.2 linux-prim.h
/*
* Symbol register
*/
-Index: lnet/klnds/gmlnd/gmlnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/gmlnd/gmlnd.h,v
-retrieving revision 1.30.6.2
-diff -u -p -r1.30.6.2 gmlnd.h
---- ./lnet/klnds/gmlnd/gmlnd.h 7 Aug 2008 09:50:20 -0000 1.30.6.2
-+++ ./lnet/klnds/gmlnd/gmlnd.h 17 Nov 2008 07:03:41 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/gmlnd/gmlnd.h lustre-1.6.6/lnet/klnds/gmlnd/gmlnd.h
+--- lustre-1.6.6~/lnet/klnds/gmlnd/gmlnd.h 2008-08-07 12:23:48.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/gmlnd/gmlnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -82,6 +82,7 @@
#include "libcfs/kp30.h"
#include "lnet/lnet.h"
@@ -139,14 +127,10 @@ diff -u -p -r1.30.6.2 gmlnd.h
/* undefine these before including the GM headers which clash */
#undef PACKAGE_BUGREPORT
-Index: lnet/klnds/gmlnd/gmlnd_module.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/gmlnd/gmlnd_module.c,v
-retrieving revision 1.22.12.2
-diff -u -p -r1.22.12.2 gmlnd_module.c
---- ./lnet/klnds/gmlnd/gmlnd_module.c 7 Aug 2008 09:50:23 -0000 1.22.12.2
-+++ ./lnet/klnds/gmlnd/gmlnd_module.c 17 Nov 2008 07:03:41 -0000
-@@ -78,9 +78,34 @@ gmnal_tunables_t gmnal_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/gmlnd/gmlnd_module.c lustre-1.6.6/lnet/klnds/gmlnd/gmlnd_module.c
+--- lustre-1.6.6~/lnet/klnds/gmlnd/gmlnd_module.c 2008-08-07 12:23:50.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/gmlnd/gmlnd_module.c 2008-11-26 12:24:08.000000000 +0100
+@@ -78,9 +78,34 @@
};
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -182,7 +166,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "port",
.data = &port,
.maxlen = sizeof (int),
-@@ -88,7 +113,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -88,7 +113,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -191,7 +175,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof (int),
-@@ -96,7 +121,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -96,7 +121,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -200,7 +184,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof (int),
-@@ -104,7 +129,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -104,7 +129,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -209,7 +193,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof (int),
-@@ -112,7 +137,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -112,7 +137,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -218,7 +202,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "nlarge_tx_bufs",
.data = &nlarge_tx_bufs,
.maxlen = sizeof (int),
-@@ -120,7 +145,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -120,7 +145,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -227,7 +211,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "nrx_small",
.data = &nrx_small,
.maxlen = sizeof (int),
-@@ -128,7 +153,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -128,7 +153,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -236,7 +220,7 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "nrx_large",
.data = &nrx_large,
.maxlen = sizeof (int),
-@@ -140,7 +165,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -140,7 +165,7 @@
static cfs_sysctl_table_t gmnal_top_ctl_table[] = {
{
@@ -245,13 +229,9 @@ diff -u -p -r1.22.12.2 gmlnd_module.c
.procname = "gmnal",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/iiblnd/iiblnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/iiblnd/iiblnd.h,v
-retrieving revision 1.13.16.2
-diff -u -p -r1.13.16.2 iiblnd.h
---- ./lnet/klnds/iiblnd/iiblnd.h 7 Aug 2008 09:50:28 -0000 1.13.16.2
-+++ ./lnet/klnds/iiblnd/iiblnd.h 17 Nov 2008 07:03:41 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/iiblnd/iiblnd.h lustre-1.6.6/lnet/klnds/iiblnd/iiblnd.h
+--- lustre-1.6.6~/lnet/klnds/iiblnd/iiblnd.h 2008-08-07 12:23:53.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/iiblnd/iiblnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -71,6 +71,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -260,14 +240,10 @@ diff -u -p -r1.13.16.2 iiblnd.h
#include <linux/iba/ibt.h>
-Index: lnet/klnds/iiblnd/iiblnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/iiblnd/iiblnd_modparams.c,v
-retrieving revision 1.5.16.2
-diff -u -p -r1.5.16.2 iiblnd_modparams.c
---- ./lnet/klnds/iiblnd/iiblnd_modparams.c 7 Aug 2008 09:50:31 -0000 1.5.16.2
-+++ ./lnet/klnds/iiblnd/iiblnd_modparams.c 17 Nov 2008 07:03:41 -0000
-@@ -119,9 +119,47 @@ kib_tunables_t kibnal_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/iiblnd/iiblnd_modparams.c lustre-1.6.6/lnet/klnds/iiblnd/iiblnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-08-07 12:23:56.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -119,9 +119,47 @@
* not to truncate the printout; it only needs to be the actual size of the
* string buffer if we allow writes (and we don't) */
@@ -316,7 +292,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "ipif_basename",
.data = &ipif_basename,
.maxlen = 1024,
-@@ -129,7 +167,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -129,7 +167,7 @@
.proc_handler = &proc_dostring
},
{
@@ -325,7 +301,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "service_name",
.data = &service_name,
.maxlen = 1024,
-@@ -137,7 +175,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -137,7 +175,7 @@
.proc_handler = &proc_dostring
},
{
@@ -334,7 +310,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "service_number",
.data = &service_number,
.maxlen = sizeof(int),
-@@ -145,7 +183,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -145,7 +183,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -343,7 +319,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -153,7 +191,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -153,7 +191,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -352,7 +328,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -161,7 +199,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -161,7 +199,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -361,7 +337,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "concurrent_peers",
.data = &concurrent_peers,
.maxlen = sizeof(int),
-@@ -169,7 +207,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -169,7 +207,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -370,7 +346,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -177,7 +215,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -177,7 +215,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -379,7 +355,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -185,7 +223,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -185,7 +223,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -388,7 +364,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -193,7 +231,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -193,7 +231,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -397,7 +373,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -201,7 +239,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -201,7 +239,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -406,7 +382,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -209,7 +247,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -209,7 +247,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -415,7 +391,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "sd_retries",
.data = &sd_retries,
.maxlen = sizeof(int),
-@@ -217,7 +255,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -217,7 +255,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -424,7 +400,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -225,7 +263,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -225,7 +263,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -433,7 +409,7 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "concurrent_sends",
.data = &concurrent_sends,
.maxlen = sizeof(int),
-@@ -237,7 +275,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -237,7 +275,7 @@
static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
{
@@ -442,13 +418,9 @@ diff -u -p -r1.5.16.2 iiblnd_modparams.c
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/mxlnd/mxlnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/mxlnd/mxlnd.h,v
-retrieving revision 1.6.6.2
-diff -u -p -r1.6.6.2 mxlnd.h
---- ./lnet/klnds/mxlnd/mxlnd.h 7 Aug 2008 09:50:32 -0000 1.6.6.2
-+++ ./lnet/klnds/mxlnd/mxlnd.h 17 Nov 2008 07:03:41 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/mxlnd/mxlnd.h lustre-1.6.6/lnet/klnds/mxlnd/mxlnd.h
+--- lustre-1.6.6~/lnet/klnds/mxlnd/mxlnd.h 2008-08-07 12:23:57.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/mxlnd/mxlnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -85,6 +85,7 @@
#include "libcfs/kp30.h"
#include "lnet/lnet.h"
@@ -457,13 +429,9 @@ diff -u -p -r1.6.6.2 mxlnd.h
#define MX_KERNEL 1
#include "mx_extensions.h"
-Index: lnet/klnds/o2iblnd/o2iblnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/o2iblnd/o2iblnd.h,v
-retrieving revision 1.10.6.3
-diff -u -p -r1.10.6.3 o2iblnd.h
---- ./lnet/klnds/o2iblnd/o2iblnd.h 7 Aug 2008 09:50:35 -0000 1.10.6.3
-+++ ./lnet/klnds/o2iblnd/o2iblnd.h 17 Nov 2008 07:03:42 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/o2iblnd/o2iblnd.h lustre-1.6.6/lnet/klnds/o2iblnd/o2iblnd.h
+--- lustre-1.6.6~/lnet/klnds/o2iblnd/o2iblnd.h 2008-08-07 12:23:59.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/o2iblnd/o2iblnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -76,6 +76,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -472,7 +440,7 @@ diff -u -p -r1.10.6.3 o2iblnd.h
#if !HAVE_GFP_T
typedef int gfp_t;
-@@ -773,3 +774,14 @@ int kiblnd_send(lnet_ni_t *ni, void *pr
+@@ -773,3 +774,14 @@
int kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
unsigned int niov, struct iovec *iov, lnet_kiov_t *kiov,
unsigned int offset, unsigned int mlen, unsigned int rlen);
@@ -487,14 +455,10 @@ diff -u -p -r1.10.6.3 o2iblnd.h
+ sg->length = len;
+}
+#endif
-Index: lnet/klnds/o2iblnd/o2iblnd_cb.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/o2iblnd/o2iblnd_cb.c,v
-retrieving revision 1.12.6.3
-diff -u -p -r1.12.6.3 o2iblnd_cb.c
---- ./lnet/klnds/o2iblnd/o2iblnd_cb.c 7 Aug 2008 09:50:35 -0000 1.12.6.3
-+++ ./lnet/klnds/o2iblnd/o2iblnd_cb.c 17 Nov 2008 07:03:42 -0000
-@@ -643,9 +643,7 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_t
+diff -urNad lustre-1.6.6~/lnet/klnds/o2iblnd/o2iblnd_cb.c lustre-1.6.6/lnet/klnds/o2iblnd/o2iblnd_cb.c
+--- lustre-1.6.6~/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-08-07 12:24:00.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-11-26 12:24:08.000000000 +0100
+@@ -643,9 +643,7 @@
fragnob = min((int)(iov->iov_len - offset), nob);
fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -505,7 +469,7 @@ diff -u -p -r1.12.6.3 o2iblnd_cb.c
sg++;
if (offset + fragnob < iov->iov_len) {
-@@ -708,11 +706,10 @@ kiblnd_setup_rd_kiov (lnet_ni_t *ni, kib
+@@ -708,11 +706,10 @@
fragnob = min((int)(kiov->kiov_len - offset), nob);
memset(sg, 0, sizeof(*sg));
@@ -520,14 +484,10 @@ diff -u -p -r1.12.6.3 o2iblnd_cb.c
offset = 0;
kiov++;
nkiov--;
-Index: lnet/klnds/o2iblnd/o2iblnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/o2iblnd/o2iblnd_modparams.c,v
-retrieving revision 1.5.16.2
-diff -u -p -r1.5.16.2 o2iblnd_modparams.c
---- ./lnet/klnds/o2iblnd/o2iblnd_modparams.c 7 Aug 2008 09:50:36 -0000 1.5.16.2
-+++ ./lnet/klnds/o2iblnd/o2iblnd_modparams.c 17 Nov 2008 07:03:42 -0000
-@@ -130,9 +130,48 @@ kib_tunables_t kiblnd_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/o2iblnd/o2iblnd_modparams.c lustre-1.6.6/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-08-07 12:24:01.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -130,9 +130,48 @@
static char ipif_basename_space[32];
@@ -577,7 +537,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "service",
.data = &service,
.maxlen = sizeof(int),
-@@ -140,7 +179,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -140,7 +179,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -586,7 +546,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -148,7 +187,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -148,7 +187,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -595,7 +555,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -156,7 +195,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -156,7 +195,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -604,7 +564,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -164,7 +203,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -164,7 +203,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -613,7 +573,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -172,7 +211,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -172,7 +211,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -622,7 +582,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -180,7 +219,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -180,7 +219,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -631,7 +591,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "ipif_name",
.data = ipif_basename_space,
.maxlen = sizeof(ipif_basename_space),
-@@ -188,7 +227,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -188,7 +227,7 @@
.proc_handler = &proc_dostring
},
{
@@ -640,7 +600,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "retry_count",
.data = &retry_count,
.maxlen = sizeof(int),
-@@ -196,7 +235,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -196,7 +235,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -649,7 +609,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "rnr_retry_count",
.data = &rnr_retry_count,
.maxlen = sizeof(int),
-@@ -204,7 +243,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -204,7 +243,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -658,7 +618,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -212,7 +251,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -212,7 +251,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -667,7 +627,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "concurrent_sends",
.data = &concurrent_sends,
.maxlen = sizeof(int),
-@@ -220,7 +259,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -220,7 +259,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -676,7 +636,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "ib_mtu",
.data = &ib_mtu,
.maxlen = sizeof(int),
-@@ -229,7 +268,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -229,7 +268,7 @@
},
#if IBLND_MAP_ON_DEMAND
{
@@ -685,7 +645,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "fmr_pool_size",
.data = &fmr_pool_size,
.maxlen = sizeof(int),
-@@ -237,7 +276,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -237,7 +276,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -694,7 +654,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "fmr_flush_trigger",
.data = &fmr_flush_trigger,
.maxlen = sizeof(int),
-@@ -245,7 +284,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -245,7 +284,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -703,7 +663,7 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "fmr_cache",
.data = &fmr_cache,
.maxlen = sizeof(int),
-@@ -258,7 +297,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -258,7 +297,7 @@
static cfs_sysctl_table_t kiblnd_top_ctl_table[] = {
{
@@ -712,13 +672,9 @@ diff -u -p -r1.5.16.2 o2iblnd_modparams.c
.procname = "o2iblnd",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/openiblnd/openiblnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/openiblnd/openiblnd.h,v
-retrieving revision 1.14.18.2
-diff -u -p -r1.14.18.2 openiblnd.h
---- ./lnet/klnds/openiblnd/openiblnd.h 7 Aug 2008 09:50:38 -0000 1.14.18.2
-+++ ./lnet/klnds/openiblnd/openiblnd.h 17 Nov 2008 07:03:42 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/openiblnd/openiblnd.h lustre-1.6.6/lnet/klnds/openiblnd/openiblnd.h
+--- lustre-1.6.6~/lnet/klnds/openiblnd/openiblnd.h 2008-08-07 12:24:03.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/openiblnd/openiblnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -74,6 +74,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -727,14 +683,10 @@ diff -u -p -r1.14.18.2 openiblnd.h
#include <ts_ib_core.h>
#include <ts_ib_cm.h>
-Index: lnet/klnds/openiblnd/openiblnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/openiblnd/openiblnd_modparams.c,v
-retrieving revision 1.5.16.2
-diff -u -p -r1.5.16.2 openiblnd_modparams.c
---- ./lnet/klnds/openiblnd/openiblnd_modparams.c 7 Aug 2008 09:50:40 -0000 1.5.16.2
-+++ ./lnet/klnds/openiblnd/openiblnd_modparams.c 17 Nov 2008 07:03:42 -0000
-@@ -100,9 +100,39 @@ kib_tunables_t kibnal_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/openiblnd/openiblnd_modparams.c lustre-1.6.6/lnet/klnds/openiblnd/openiblnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-08-07 12:24:05.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -100,9 +100,39 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -775,7 +727,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "ipif_basename",
.data = &ipif_basename,
.maxlen = 1024,
-@@ -110,7 +140,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -110,7 +140,7 @@
.proc_handler = &proc_dostring
},
{
@@ -784,7 +736,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "n_connd",
.data = &n_connd,
.maxlen = sizeof(int),
-@@ -118,7 +148,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -118,7 +148,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -793,7 +745,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -126,7 +156,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -126,7 +156,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -802,7 +754,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -134,7 +164,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -134,7 +164,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -811,7 +763,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "concurrent_peers",
.data = &concurrent_peers,
.maxlen = sizeof(int),
-@@ -142,7 +172,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -142,7 +172,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -820,7 +772,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -150,7 +180,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -150,7 +180,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -829,7 +781,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -158,7 +188,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -158,7 +188,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -838,7 +790,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -166,7 +196,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -166,7 +196,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -847,7 +799,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -174,7 +204,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -174,7 +204,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -856,7 +808,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -182,7 +212,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -182,7 +212,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -865,7 +817,7 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -194,7 +224,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -194,7 +224,7 @@
static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
{
@@ -874,13 +826,9 @@ diff -u -p -r1.5.16.2 openiblnd_modparams.c
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/ptllnd/ptllnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/ptllnd/ptllnd.h,v
-retrieving revision 1.11.6.2
-diff -u -p -r1.11.6.2 ptllnd.h
---- ./lnet/klnds/ptllnd/ptllnd.h 7 Aug 2008 09:50:41 -0000 1.11.6.2
-+++ ./lnet/klnds/ptllnd/ptllnd.h 17 Nov 2008 07:03:42 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/ptllnd/ptllnd.h lustre-1.6.6/lnet/klnds/ptllnd/ptllnd.h
+--- lustre-1.6.6~/lnet/klnds/ptllnd/ptllnd.h 2008-08-07 12:24:06.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/ptllnd/ptllnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -76,6 +76,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -889,14 +837,10 @@ diff -u -p -r1.11.6.2 ptllnd.h
#include <portals/p30.h>
#ifdef CRAY_XT3
#include <portals/ptltrace.h>
-Index: lnet/klnds/ptllnd/ptllnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/ptllnd/ptllnd_modparams.c,v
-retrieving revision 1.9.12.2
-diff -u -p -r1.9.12.2 ptllnd_modparams.c
---- ./lnet/klnds/ptllnd/ptllnd_modparams.c 7 Aug 2008 09:50:42 -0000 1.9.12.2
-+++ ./lnet/klnds/ptllnd/ptllnd_modparams.c 17 Nov 2008 07:03:42 -0000
-@@ -156,9 +156,51 @@ kptllnd_init_strtunable(char **str_param
+diff -urNad lustre-1.6.6~/lnet/klnds/ptllnd/ptllnd_modparams.c lustre-1.6.6/lnet/klnds/ptllnd/ptllnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-08-07 12:24:06.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -156,9 +156,51 @@
}
#endif
@@ -949,7 +893,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -166,7 +208,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -166,7 +208,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -958,7 +902,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "max_nodes",
.data = &max_nodes,
.maxlen = sizeof(int),
-@@ -174,7 +216,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -174,7 +216,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -967,7 +911,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "max_procs_per_node",
.data = &max_procs_per_node,
.maxlen = sizeof(int),
-@@ -182,7 +224,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -182,7 +224,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -976,7 +920,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "checksum",
.data = &checksum,
.maxlen = sizeof(int),
-@@ -190,7 +232,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -190,7 +232,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -985,7 +929,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -198,7 +240,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -198,7 +240,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -994,7 +938,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "portal",
.data = &portal,
.maxlen = sizeof(int),
-@@ -206,7 +248,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -206,7 +248,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1003,7 +947,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "pid",
.data = &pid,
.maxlen = sizeof(int),
-@@ -214,7 +256,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -214,7 +256,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1012,7 +956,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "rxb_npages",
.data = &rxb_npages,
.maxlen = sizeof(int),
-@@ -222,7 +264,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -222,7 +264,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1021,7 +965,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -230,7 +272,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -230,7 +272,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1030,7 +974,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "peercredits",
.data = &peercredits,
.maxlen = sizeof(int),
-@@ -238,7 +280,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -238,7 +280,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1039,7 +983,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "max_msg_size",
.data = &max_msg_size,
.maxlen = sizeof(int),
-@@ -246,7 +288,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -246,7 +288,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1048,7 +992,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "peer_hash_table_size",
.data = &peer_hash_table_size,
.maxlen = sizeof(int),
-@@ -254,7 +296,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -254,7 +296,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1057,7 +1001,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "reschedule_loops",
.data = &reschedule_loops,
.maxlen = sizeof(int),
-@@ -262,7 +304,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -262,7 +304,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1066,7 +1010,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "ack_puts",
.data = &ack_puts,
.maxlen = sizeof(int),
-@@ -271,7 +313,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -271,7 +313,7 @@
},
#ifdef CRAY_XT3
{
@@ -1075,7 +1019,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "ptltrace_on_timeout",
.data = &ptltrace_on_timeout,
.maxlen = sizeof(int),
-@@ -279,7 +321,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -279,7 +321,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1084,7 +1028,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "ptltrace_basename",
.data = ptltrace_basename_space,
.maxlen = sizeof(ptltrace_basename_space),
-@@ -290,7 +332,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -290,7 +332,7 @@
#endif
#ifdef PJK_DEBUGGING
{
@@ -1093,7 +1037,7 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "simulation_bitmap",
.data = &simulation_bitmap,
.maxlen = sizeof(int),
-@@ -304,7 +346,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -304,7 +346,7 @@
static cfs_sysctl_table_t kptllnd_top_ctl_table[] = {
{
@@ -1102,13 +1046,9 @@ diff -u -p -r1.9.12.2 ptllnd_modparams.c
.procname = "ptllnd",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/qswlnd/qswlnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/qswlnd/qswlnd.h,v
-retrieving revision 1.36.6.2
-diff -u -p -r1.36.6.2 qswlnd.h
---- ./lnet/klnds/qswlnd/qswlnd.h 7 Aug 2008 09:50:45 -0000 1.36.6.2
-+++ ./lnet/klnds/qswlnd/qswlnd.h 17 Nov 2008 07:03:42 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/qswlnd/qswlnd.h lustre-1.6.6/lnet/klnds/qswlnd/qswlnd.h
+--- lustre-1.6.6~/lnet/klnds/qswlnd/qswlnd.h 2008-08-07 12:24:10.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/qswlnd/qswlnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -81,6 +81,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -1117,14 +1057,10 @@ diff -u -p -r1.36.6.2 qswlnd.h
/* fixed constants */
#define KQSW_SMALLMSG (4<<10) /* small/large ep receiver breakpoint */
-Index: lnet/klnds/qswlnd/qswlnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/qswlnd/qswlnd_modparams.c,v
-retrieving revision 1.6.16.1
-diff -u -p -r1.6.16.1 qswlnd_modparams.c
---- ./lnet/klnds/qswlnd/qswlnd_modparams.c 25 Jul 2008 19:55:33 -0000 1.6.16.1
-+++ ./lnet/klnds/qswlnd/qswlnd_modparams.c 17 Nov 2008 07:03:42 -0000
-@@ -87,9 +87,41 @@ kqswnal_tunables_t kqswnal_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/qswlnd/qswlnd_modparams.c lustre-1.6.6/lnet/klnds/qswlnd/qswlnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-07-25 21:55:33.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -87,9 +87,41 @@
};
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -1167,7 +1103,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "tx_maxcontig",
.data = &tx_maxcontig,
.maxlen = sizeof (int),
-@@ -97,7 +129,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -97,7 +129,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1176,7 +1112,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "ntxmsgs",
.data = &ntxmsgs,
.maxlen = sizeof (int),
-@@ -105,7 +137,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -105,7 +137,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1185,7 +1121,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof (int),
-@@ -113,7 +145,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -113,7 +145,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1194,7 +1130,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof (int),
-@@ -121,7 +153,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -121,7 +153,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1203,7 +1139,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "nrxmsgs_large",
.data = &nrxmsgs_large,
.maxlen = sizeof (int),
-@@ -129,7 +161,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -129,7 +161,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1212,7 +1148,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "ep_envelopes_large",
.data = &ep_envelopes_large,
.maxlen = sizeof (int),
-@@ -137,7 +169,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -137,7 +169,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1221,7 +1157,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "nrxmsgs_small",
.data = &nrxmsgs_small,
.maxlen = sizeof (int),
-@@ -145,7 +177,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -145,7 +177,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1230,7 +1166,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "ep_envelopes_small",
.data = &ep_envelopes_small,
.maxlen = sizeof (int),
-@@ -153,7 +185,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -153,7 +185,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1239,7 +1175,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "optimized_puts",
.data = &optimized_puts,
.maxlen = sizeof (int),
-@@ -161,7 +193,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -161,7 +193,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1248,7 +1184,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "optimized_gets",
.data = &optimized_gets,
.maxlen = sizeof (int),
-@@ -170,7 +202,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -170,7 +202,7 @@
},
#if KQSW_CKSUM
{
@@ -1257,7 +1193,7 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "inject_csum_error",
.data = &inject_csum_error,
.maxlen = sizeof (int),
-@@ -183,7 +215,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -183,7 +215,7 @@
static cfs_sysctl_table_t kqswnal_top_ctl_table[] = {
{
@@ -1266,13 +1202,9 @@ diff -u -p -r1.6.16.1 qswlnd_modparams.c
.procname = "qswnal",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/ralnd/ralnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/ralnd/ralnd.h,v
-retrieving revision 1.17.18.2
-diff -u -p -r1.17.18.2 ralnd.h
---- ./lnet/klnds/ralnd/ralnd.h 7 Aug 2008 09:50:46 -0000 1.17.18.2
-+++ ./lnet/klnds/ralnd/ralnd.h 17 Nov 2008 07:03:43 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/ralnd/ralnd.h lustre-1.6.6/lnet/klnds/ralnd/ralnd.h
+--- lustre-1.6.6~/lnet/klnds/ralnd/ralnd.h 2008-08-07 12:24:11.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/ralnd/ralnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -74,6 +74,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -1281,14 +1213,10 @@ diff -u -p -r1.17.18.2 ralnd.h
#include <rapl.h>
-Index: lnet/klnds/ralnd/ralnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/ralnd/ralnd_modparams.c,v
-retrieving revision 1.4.18.2
-diff -u -p -r1.4.18.2 ralnd_modparams.c
---- ./lnet/klnds/ralnd/ralnd_modparams.c 7 Aug 2008 09:50:47 -0000 1.4.18.2
-+++ ./lnet/klnds/ralnd/ralnd_modparams.c 17 Nov 2008 07:03:43 -0000
-@@ -89,9 +89,35 @@ kra_tunables_t kranal_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/ralnd/ralnd_modparams.c lustre-1.6.6/lnet/klnds/ralnd/ralnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/ralnd/ralnd_modparams.c 2008-08-07 12:24:12.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/ralnd/ralnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -89,9 +89,35 @@
};
#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
@@ -1325,7 +1253,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "n_connd",
.data = &n_connd,
.maxlen = sizeof(int),
-@@ -99,7 +125,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -99,7 +125,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1334,7 +1262,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -107,7 +133,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -107,7 +133,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1343,7 +1271,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -115,7 +141,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -115,7 +141,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1352,7 +1280,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -123,7 +149,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -123,7 +149,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1361,7 +1289,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -131,7 +157,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -131,7 +157,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1370,7 +1298,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -139,7 +165,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -139,7 +165,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1379,7 +1307,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "fma_cq_size",
.data = &fma_cq_size,
.maxlen = sizeof(int),
-@@ -147,7 +173,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -147,7 +173,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1388,7 +1316,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -155,7 +181,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -155,7 +181,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1397,7 +1325,7 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "max_immediate",
.data = &max_immediate,
.maxlen = sizeof(int),
-@@ -167,7 +193,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -167,7 +193,7 @@
static cfs_sysctl_table_t kranal_top_ctl_table[] = {
{
@@ -1406,13 +1334,9 @@ diff -u -p -r1.4.18.2 ralnd_modparams.c
.procname = "ranal",
.data = NULL,
.maxlen = 0,
-Index: lnet/klnds/socklnd/socklnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/socklnd/socklnd.h,v
-retrieving revision 1.40.6.1
-diff -u -p -r1.40.6.1 socklnd.h
---- ./lnet/klnds/socklnd/socklnd.h 25 Jul 2008 19:55:33 -0000 1.40.6.1
-+++ ./lnet/klnds/socklnd/socklnd.h 17 Nov 2008 07:03:43 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/socklnd/socklnd.h lustre-1.6.6/lnet/klnds/socklnd/socklnd.h
+--- lustre-1.6.6~/lnet/klnds/socklnd/socklnd.h 2008-07-25 21:55:33.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/socklnd/socklnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -46,6 +46,7 @@
#include <lnet/lnet.h>
#include <lnet/lib-lnet.h>
@@ -1421,13 +1345,9 @@ diff -u -p -r1.40.6.1 socklnd.h
#define SOCKNAL_PEER_HASH_SIZE 101 /* # peer lists */
#define SOCKNAL_RESCHED 100 /* # scheduler loops before reschedule */
-Index: lnet/klnds/socklnd/socklnd_lib-linux.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/socklnd/socklnd_lib-linux.c,v
-retrieving revision 1.11.14.3
-diff -u -p -r1.11.14.3 socklnd_lib-linux.c
---- ./lnet/klnds/socklnd/socklnd_lib-linux.c 7 Aug 2008 09:50:49 -0000 1.11.14.3
-+++ ./lnet/klnds/socklnd/socklnd_lib-linux.c 17 Nov 2008 07:03:43 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/socklnd/socklnd_lib-linux.c lustre-1.6.6/lnet/klnds/socklnd/socklnd_lib-linux.c
+--- lustre-1.6.6~/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-08-07 12:24:14.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-11-26 12:24:08.000000000 +0100
@@ -37,197 +37,261 @@
#include "socklnd.h"
@@ -1767,10 +1687,10 @@ diff -u -p -r1.11.14.3 socklnd_lib-linux.c
- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) { 0 };
+ {0}
+};
-+
- LASSERT (j == i);
- LASSERT (i <= sizeof(ksocknal_ctl_table)/sizeof(ksocknal_ctl_table[0]));
+
+cfs_sysctl_table_t ksocknal_top_ctl_table[] = {
+ {
+ .ctl_name = CTL_SOCKLND,
@@ -1782,20 +1702,16 @@ diff -u -p -r1.11.14.3 socklnd_lib-linux.c
+ },
+ { 0 }
+};
-
++
+int
+ksocknal_lib_tunables_init ()
+{
ksocknal_tunables.ksnd_sysctl =
cfs_register_sysctl_table(ksocknal_top_ctl_table, 0);
-Index: lnet/klnds/viblnd/viblnd.h
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/viblnd/viblnd.h,v
-retrieving revision 1.25.16.2
-diff -u -p -r1.25.16.2 viblnd.h
---- ./lnet/klnds/viblnd/viblnd.h 7 Aug 2008 09:50:52 -0000 1.25.16.2
-+++ ./lnet/klnds/viblnd/viblnd.h 17 Nov 2008 07:03:43 -0000
+diff -urNad lustre-1.6.6~/lnet/klnds/viblnd/viblnd.h lustre-1.6.6/lnet/klnds/viblnd/viblnd.h
+--- lustre-1.6.6~/lnet/klnds/viblnd/viblnd.h 2008-08-07 12:24:16.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/viblnd/viblnd.h 2008-11-26 12:24:08.000000000 +0100
@@ -76,6 +76,7 @@
#include <libcfs/kp30.h>
#include <lnet/lnet.h>
@@ -1804,14 +1720,10 @@ diff -u -p -r1.25.16.2 viblnd.h
/* CPU_{L,B}E #defines needed by Voltaire headers */
#include <asm/byteorder.h>
-Index: lnet/klnds/viblnd/viblnd_modparams.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/klnds/viblnd/viblnd_modparams.c,v
-retrieving revision 1.6.12.2
-diff -u -p -r1.6.12.2 viblnd_modparams.c
---- ./lnet/klnds/viblnd/viblnd_modparams.c 7 Aug 2008 09:50:53 -0000 1.6.12.2
-+++ ./lnet/klnds/viblnd/viblnd_modparams.c 17 Nov 2008 07:03:43 -0000
-@@ -142,6 +142,53 @@ kib_tunables_t kibnal_tunables = {
+diff -urNad lustre-1.6.6~/lnet/klnds/viblnd/viblnd_modparams.c lustre-1.6.6/lnet/klnds/viblnd/viblnd_modparams.c
+--- lustre-1.6.6~/lnet/klnds/viblnd/viblnd_modparams.c 2008-08-07 12:24:17.000000000 +0200
++++ lustre-1.6.6/lnet/klnds/viblnd/viblnd_modparams.c 2008-11-26 12:24:08.000000000 +0100
+@@ -142,6 +142,53 @@
#endif
};
@@ -1865,7 +1777,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static char hca_basename_space[32];
-@@ -149,7 +196,7 @@ static char ipif_basename_space[32];
+@@ -149,7 +196,7 @@
static cfs_sysctl_table_t kibnal_ctl_table[] = {
{
@@ -1874,7 +1786,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "service_number",
.data = &service_number,
.maxlen = sizeof(int),
-@@ -157,7 +204,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -157,7 +204,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1883,7 +1795,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -165,7 +212,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -165,7 +212,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1892,7 +1804,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -173,7 +220,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -173,7 +220,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1901,7 +1813,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "concurrent_peers",
.data = &concurrent_peers,
.maxlen = sizeof(int),
-@@ -181,7 +228,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -181,7 +228,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1910,7 +1822,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -189,7 +236,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -189,7 +236,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1919,7 +1831,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -197,7 +244,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -197,7 +244,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1928,7 +1840,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -205,7 +252,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -205,7 +252,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1937,7 +1849,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -213,7 +260,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -213,7 +260,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1946,7 +1858,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -221,7 +268,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -221,7 +268,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1955,7 +1867,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "arp_retries",
.data = &arp_retries,
.maxlen = sizeof(int),
-@@ -229,7 +276,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -229,7 +276,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1964,7 +1876,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "hca_basename",
.data = hca_basename_space,
.maxlen = sizeof(hca_basename_space),
-@@ -237,7 +284,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -237,7 +284,7 @@
.proc_handler = &proc_dostring
},
{
@@ -1973,7 +1885,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "ipif_basename",
.data = ipif_basename_space,
.maxlen = sizeof(ipif_basename_space),
-@@ -245,7 +292,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -245,7 +292,7 @@
.proc_handler = &proc_dostring
},
{
@@ -1982,7 +1894,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "local_ack_timeout",
.data = &local_ack_timeout,
.maxlen = sizeof(int),
-@@ -253,7 +300,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -253,7 +300,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1991,7 +1903,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "retry_cnt",
.data = &retry_cnt,
.maxlen = sizeof(int),
-@@ -261,7 +308,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -261,7 +308,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -2000,7 +1912,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "rnr_cnt",
.data = &rnr_cnt,
.maxlen = sizeof(int),
-@@ -269,7 +316,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -269,7 +316,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -2009,7 +1921,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "rnr_nak_timer",
.data = &rnr_nak_timer,
.maxlen = sizeof(int),
-@@ -277,7 +324,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -277,7 +324,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -2018,7 +1930,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -285,7 +332,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -285,7 +332,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -2027,7 +1939,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "concurrent_sends",
.data = &concurrent_sends,
.maxlen = sizeof(int),
-@@ -294,7 +341,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -294,7 +341,7 @@
},
#if IBNAL_USE_FMR
{
@@ -2036,7 +1948,7 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "fmr_remaps",
.data = &fmr_remaps,
.maxlen = sizeof(int),
-@@ -307,7 +354,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -307,7 +354,7 @@
static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
{
@@ -2045,60 +1957,12 @@ diff -u -p -r1.6.12.2 viblnd_modparams.c
.procname = "vibnal",
.data = NULL,
.maxlen = 0,
-Index: lnet/libcfs/linux/linux-curproc.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/libcfs/linux/Attic/linux-curproc.c,v
-retrieving revision 1.3.44.3
-diff -u -p -r1.3.44.3 linux-curproc.c
---- ./lnet/libcfs/linux/linux-curproc.c 15 Sep 2008 18:44:53 -0000 1.3.44.3
-+++ ./lnet/libcfs/linux/linux-curproc.c 17 Nov 2008 07:03:43 -0000
-@@ -142,25 +142,29 @@ int cfs_cap_raised(cfs_cap_t cap)
-
- void cfs_kernel_cap_pack(cfs_kernel_cap_t kcap, cfs_cap_t *cap)
- {
--#if _LINUX_CAPABILITY_VERSION == 0x19980330
-+#if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
- *cap = cfs_cap_pack(kcap);
--#elif _LINUX_CAPABILITY_VERSION == 0x20071026
-+#elif defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x20071026
- *cap = cfs_cap_pack(kcap[0]);
-+#elif defined(_KERNEL_CAPABILITY_VERSION) && _KERNEL_CAPABILITY_VERSION == 0x20080522
-+ /* XXX lost high byte */
-+ *cap = cfs_cap_pack(kcap.cap[0]);
- #else
-- #error "need correct _LINUX_CAPABILITY_VERSION "
-+ #error "need correct _KERNEL_CAPABILITY_VERSION "
- #endif
- }
-
- void cfs_kernel_cap_unpack(cfs_kernel_cap_t *kcap, cfs_cap_t cap)
- {
--#if _LINUX_CAPABILITY_VERSION == 0x19980330
-+#if defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x19980330
- *kcap = cfs_cap_unpack(cap);
--#elif _LINUX_CAPABILITY_VERSION == 0x20071026
-+#elif defined (_LINUX_CAPABILITY_VERSION) && _LINUX_CAPABILITY_VERSION == 0x20071026
- (*kcap)[0] = cfs_cap_unpack(cap);
-+#elif defined(_KERNEL_CAPABILITY_VERSION) && _KERNEL_CAPABILITY_VERSION == 0x20080522
-+ kcap->cap[0] = cfs_cap_unpack(cap);
- #else
-- #error "need correct _LINUX_CAPABILITY_VERSION "
-+ #error "need correct _KERNEL_CAPABILITY_VERSION "
- #endif
--
- }
-
- cfs_cap_t cfs_curproc_cap_pack(void)
-Index: lnet/libcfs/linux/linux-proc.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/libcfs/linux/Attic/linux-proc.c,v
-retrieving revision 1.15.6.4
-diff -u -p -r1.15.6.4 linux-proc.c
---- ./lnet/libcfs/linux/linux-proc.c 27 Aug 2008 16:30:14 -0000 1.15.6.4
-+++ ./lnet/libcfs/linux/linux-proc.c 17 Nov 2008 07:03:43 -0000
-@@ -83,7 +83,8 @@ extern char lnet_upcall[1024];
- */
- extern char lnet_debug_log_upcall[1024];
+diff -urNad lustre-1.6.6~/lnet/libcfs/linux/linux-proc.c lustre-1.6.6/lnet/libcfs/linux/linux-proc.c
+--- lustre-1.6.6~/lnet/libcfs/linux/linux-proc.c 2008-09-01 06:35:33.000000000 +0200
++++ lustre-1.6.6/lnet/libcfs/linux/linux-proc.c 2008-11-26 12:24:08.000000000 +0100
+@@ -79,7 +79,8 @@
+ static cfs_sysctl_table_header_t *lnet_table_header = NULL;
+ extern char lnet_upcall[1024];
-#define PSDEV_LNET (0x100)
+#ifndef HAVE_SYSCTL_UNNUMBERED
@@ -2106,9 +1970,9 @@ diff -u -p -r1.15.6.4 linux-proc.c
enum {
PSDEV_DEBUG = 1, /* control debugging */
PSDEV_SUBSYSTEM_DEBUG, /* control debugging */
-@@ -103,6 +104,27 @@ enum {
+@@ -98,6 +99,27 @@
+ PSDEV_LNET_DAEMON_FILE, /* spool kernel debug buffer to file */
PSDEV_LNET_DEBUG_MB, /* size of debug buffer */
- PSDEV_LNET_DEBUG_LOG_UPCALL, /* debug log upcall script */
};
+#else
+#define CTL_LNET CTL_UNNUMBERED
@@ -2132,9 +1996,9 @@ diff -u -p -r1.15.6.4 linux-proc.c
+#endif
+
- static int
- proc_call_handler(void *data, int write,
-@@ -123,17 +145,7 @@ proc_call_handler(void *data, int write,
+ static int
+ proc_call_handler(void *data, int write,
+@@ -118,17 +140,7 @@
}
return 0;
}
@@ -2151,9 +2015,9 @@ diff -u -p -r1.15.6.4 linux-proc.c
-}
+EXPORT_SYMBOL(proc_call_handler);
- static int __proc_dobitmasks(void *data, int write,
+ static int __proc_dobitmasks(void *data, int write,
loff_t pos, void *buffer, int nob)
-@@ -324,7 +336,7 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -319,7 +331,7 @@
.data = &libcfs_debug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2162,7 +2026,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
},
{
.ctl_name = PSDEV_SUBSYSTEM_DEBUG,
-@@ -332,7 +344,7 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -327,7 +339,7 @@
.data = &libcfs_subsystem_debug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2171,7 +2035,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
},
{
.ctl_name = PSDEV_PRINTK,
-@@ -340,7 +352,7 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -335,7 +347,7 @@
.data = &libcfs_printk,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2180,7 +2044,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
},
{
.ctl_name = PSDEV_CONSOLE_RATELIMIT,
-@@ -401,7 +413,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -390,7 +402,8 @@
.data = (int *)&libcfs_kmemory.counter,
.maxlen = sizeof(int),
.mode = 0444,
@@ -2190,7 +2054,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
},
{
.ctl_name = PSDEV_LNET_CATASTROPHE,
-@@ -409,7 +422,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -398,7 +411,8 @@
.data = &libcfs_catastrophe,
.maxlen = sizeof(int),
.mode = 0444,
@@ -2200,7 +2064,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
},
{
.ctl_name = PSDEV_LNET_PANIC_ON_LBUG,
-@@ -417,11 +431,13 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -406,11 +420,13 @@
.data = &libcfs_panic_on_lbug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2215,7 +2079,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
.mode = 0200,
.proc_handler = &proc_dump_kernel,
},
-@@ -429,6 +445,7 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -418,6 +434,7 @@
.ctl_name = PSDEV_LNET_DAEMON_FILE,
.procname = "daemon_file",
.mode = 0644,
@@ -2223,7 +2087,7 @@ diff -u -p -r1.15.6.4 linux-proc.c
.proc_handler = &proc_daemon_file,
},
{
-@@ -440,21 +457,24 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -429,21 +446,24 @@
{0}
};
@@ -2253,13 +2117,9 @@ diff -u -p -r1.15.6.4 linux-proc.c
if (lnet_table_header == NULL)
lnet_table_header = cfs_register_sysctl_table(top_table, 0);
#endif
-Index: lnet/lnet/router_proc.c
-===================================================================
-RCS file: /cvsroot/cfs/lnet/lnet/router_proc.c,v
-retrieving revision 1.5.10.1
-diff -u -p -r1.5.10.1 router_proc.c
---- ./lnet/lnet/router_proc.c 25 Jul 2008 19:55:38 -0000 1.5.10.1
-+++ ./lnet/lnet/router_proc.c 17 Nov 2008 07:03:43 -0000
+diff -urNad lustre-1.6.6~/lnet/lnet/router_proc.c lustre-1.6.6/lnet/lnet/router_proc.c
+--- lustre-1.6.6~/lnet/lnet/router_proc.c 2008-07-25 21:55:38.000000000 +0200
++++ lustre-1.6.6/lnet/lnet/router_proc.c 2008-11-26 12:24:08.000000000 +0100
@@ -32,12 +32,13 @@
/* this is really lnet_proc.c */
@@ -2280,7 +2140,7 @@ diff -u -p -r1.5.10.1 router_proc.c
static int
lnet_router_proc_stats_read (char *page, char **start, off_t off,
-@@ -1007,6 +1008,13 @@ lnet_proc_init(void)
+@@ -1007,6 +1008,13 @@
{
struct proc_dir_entry *pde;
@@ -2294,7 +2154,7 @@ diff -u -p -r1.5.10.1 router_proc.c
/* Initialize LNET_PROC_STATS */
pde = create_proc_entry (LNET_PROC_STATS, 0644, NULL);
if (pde == NULL) {
-@@ -1078,6 +1086,9 @@ lnet_proc_fini(void)
+@@ -1078,6 +1086,9 @@
remove_proc_entry(LNET_PROC_PEERS, 0);
remove_proc_entry(LNET_PROC_BUFFERS, 0);
remove_proc_entry(LNET_PROC_NIS, 0);
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list