[Pkg-lustre-svn-commit] r500 - /trunk/debian/patches/patchless_support_2.6.24.dpatch
winnie at users.alioth.debian.org
winnie at users.alioth.debian.org
Tue Sep 16 14:02:19 UTC 2008
Author: winnie
Date: Tue Sep 16 14:02:18 2008
New Revision: 500
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=500
Log:
updated patch to support 2.6.18 clients further,
furthermore fixed one typo
Modified:
trunk/debian/patches/patchless_support_2.6.24.dpatch
Modified: trunk/debian/patches/patchless_support_2.6.24.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/patchless_support_2.6.24.dpatch?rev=500&op=diff
==============================================================================
--- trunk/debian/patches/patchless_support_2.6.24.dpatch (original)
+++ trunk/debian/patches/patchless_support_2.6.24.dpatch Tue Sep 16 14:02:18 2008
@@ -5,10 +5,10 @@
## DP: Patch which will enable 2.6.24 patchless support for lustre, taken from #14250
@DPATCH@
-diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
---- a/lnet/autoconf/lustre-lnet.m4
-+++ b/lnet/autoconf/lustre-lnet.m4
-@@ -1263,6 +1263,41 @@ LB_LINUX_TRY_COMPILE([
+diff -urNad lustre-1.6.5.1~/lnet/autoconf/lustre-lnet.m4 lustre-1.6.5.1/lnet/autoconf/lustre-lnet.m4
+--- lustre-1.6.5.1~/lnet/autoconf/lustre-lnet.m4 2008-06-26 06:43:33.000000000 +0200
++++ lustre-1.6.5.1/lnet/autoconf/lustre-lnet.m4 2008-09-16 15:51:29.000000000 +0200
+@@ -1263,6 +1263,41 @@
])
])
@@ -50,7 +50,7 @@
#
# LN_PROG_LINUX
#
-@@ -1305,6 +1340,9 @@ LN_KMEM_CACHE
+@@ -1305,6 +1340,9 @@
LN_KMEM_CACHE
# 2.6.23
LN_KMEM_CACHE_CREATE_DTOR
@@ -60,10 +60,10 @@
])
#
-diff --git a/lnet/include/libcfs/curproc.h b/lnet/include/libcfs/curproc.h
---- a/lnet/include/libcfs/curproc.h
-+++ b/lnet/include/libcfs/curproc.h
-@@ -49,6 +49,11 @@ char *cfs_curproc_comm(void);
+diff -urNad lustre-1.6.5.1~/lnet/include/libcfs/curproc.h lustre-1.6.5.1/lnet/include/libcfs/curproc.h
+--- lustre-1.6.5.1~/lnet/include/libcfs/curproc.h 2007-02-10 01:04:30.000000000 +0100
++++ lustre-1.6.5.1/lnet/include/libcfs/curproc.h 2008-09-16 15:51:29.000000000 +0200
+@@ -49,6 +49,11 @@
*/
cfs_kernel_cap_t cfs_curproc_cap_get(void);
void cfs_curproc_cap_set(cfs_kernel_cap_t cap);
@@ -75,14 +75,13 @@
#endif
/* __LIBCFS_CURPROC_H__ */
-diff --git a/lnet/include/libcfs/linux/linux-prim.h b/lnet/include/libcfs/linux/linux-prim.h
---- a/lnet/include/libcfs/linux/linux-prim.h
-+++ b/lnet/include/libcfs/linux/linux-prim.h
-@@ -67,6 +67,17 @@ typedef struct ctl_table_header cfs_sys
- #define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
+diff -urNad lustre-1.6.5.1~/lnet/include/libcfs/linux/linux-prim.h lustre-1.6.5.1/lnet/include/libcfs/linux/linux-prim.h
+--- lustre-1.6.5.1~/lnet/include/libcfs/linux/linux-prim.h 2008-01-14 02:12:18.000000000 +0100
++++ lustre-1.6.5.1/lnet/include/libcfs/linux/linux-prim.h 2008-09-16 15:51:29.000000000 +0200
+@@ -68,6 +68,17 @@
#endif
#define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t)
-+
+
+#define DECLARE_PROC_HANDLER(name) \
+static int \
+LL_PROC_PROTO(name) \
@@ -93,13 +92,14 @@
+ ppos, buffer, lenp, \
+ __##name); \
+}
-
++
/*
* Symbol register
-diff --git a/lnet/klnds/gmlnd/gmlnd_module.c b/lnet/klnds/gmlnd/gmlnd_module.c
---- a/lnet/klnds/gmlnd/gmlnd_module.c
-+++ b/lnet/klnds/gmlnd/gmlnd_module.c
-@@ -62,9 +62,37 @@ gmnal_tunables_t gmnal_tunables = {
+ */
+diff -urNad lustre-1.6.5.1~/lnet/klnds/gmlnd/gmlnd_module.c lustre-1.6.5.1/lnet/klnds/gmlnd/gmlnd_module.c
+--- lustre-1.6.5.1~/lnet/klnds/gmlnd/gmlnd_module.c 2007-09-27 04:30:24.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/gmlnd/gmlnd_module.c 2008-09-16 15:51:29.000000000 +0200
+@@ -62,9 +62,37 @@
};
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -138,7 +138,7 @@
.procname = "port",
.data = &port,
.maxlen = sizeof (int),
-@@ -72,7 +100,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -72,7 +100,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -147,7 +147,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof (int),
-@@ -80,7 +108,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -80,7 +108,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -156,7 +156,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof (int),
-@@ -88,7 +116,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -88,7 +116,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -165,7 +165,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof (int),
-@@ -96,7 +124,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -96,7 +124,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -174,7 +174,7 @@
.procname = "nlarge_tx_bufs",
.data = &nlarge_tx_bufs,
.maxlen = sizeof (int),
-@@ -104,7 +132,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -104,7 +132,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -183,7 +183,7 @@
.procname = "nrx_small",
.data = &nrx_small,
.maxlen = sizeof (int),
-@@ -112,7 +140,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -112,7 +140,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -192,7 +192,7 @@
.procname = "nrx_large",
.data = &nrx_large,
.maxlen = sizeof (int),
-@@ -124,7 +152,7 @@ static cfs_sysctl_table_t gmnal_ctl_tabl
+@@ -124,7 +152,7 @@
static cfs_sysctl_table_t gmnal_top_ctl_table[] = {
{
@@ -201,10 +201,10 @@
.procname = "gmnal",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/iiblnd/iiblnd_modparams.c b/lnet/klnds/iiblnd/iiblnd_modparams.c
---- a/lnet/klnds/iiblnd/iiblnd_modparams.c
-+++ b/lnet/klnds/iiblnd/iiblnd_modparams.c
-@@ -102,9 +102,50 @@ kib_tunables_t kibnal_tunables = {
+diff -urNad lustre-1.6.5.1~/lnet/klnds/iiblnd/iiblnd_modparams.c lustre-1.6.5.1/lnet/klnds/iiblnd/iiblnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/iiblnd/iiblnd_modparams.c 2007-09-10 17:35:53.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
+@@ -102,9 +102,50 @@
* 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) */
@@ -256,7 +256,7 @@
.procname = "ipif_basename",
.data = &ipif_basename,
.maxlen = 1024,
-@@ -112,7 +153,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -112,7 +153,7 @@
.proc_handler = &proc_dostring
},
{
@@ -265,7 +265,7 @@
.procname = "service_name",
.data = &service_name,
.maxlen = 1024,
-@@ -120,7 +161,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -120,7 +161,7 @@
.proc_handler = &proc_dostring
},
{
@@ -274,7 +274,7 @@
.procname = "service_number",
.data = &service_number,
.maxlen = sizeof(int),
-@@ -128,7 +169,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -128,7 +169,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -283,7 +283,7 @@
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -136,7 +177,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -136,7 +177,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -292,7 +292,7 @@
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -144,7 +185,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -144,7 +185,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -301,7 +301,7 @@
.procname = "concurrent_peers",
.data = &concurrent_peers,
.maxlen = sizeof(int),
-@@ -152,7 +193,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -152,7 +193,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -310,7 +310,7 @@
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -160,7 +201,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -160,7 +201,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -319,7 +319,7 @@
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -168,7 +209,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -168,7 +209,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -328,7 +328,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -176,7 +217,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -176,7 +217,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -337,7 +337,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -184,7 +225,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -184,7 +225,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -346,7 +346,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -192,7 +233,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -192,7 +233,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -355,7 +355,7 @@
.procname = "sd_retries",
.data = &sd_retries,
.maxlen = sizeof(int),
-@@ -200,7 +241,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -200,7 +241,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -364,7 +364,7 @@
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -208,7 +249,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -208,7 +249,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -373,7 +373,7 @@
.procname = "concurrent_sends",
.data = &concurrent_sends,
.maxlen = sizeof(int),
-@@ -220,7 +261,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -220,7 +261,7 @@
static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
{
@@ -382,10 +382,10 @@
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
---- a/lnet/klnds/o2iblnd/o2iblnd.h
-+++ b/lnet/klnds/o2iblnd/o2iblnd.h
-@@ -759,3 +759,13 @@ int kiblnd_recv(lnet_ni_t *ni, void *pr
+diff -urNad lustre-1.6.5.1~/lnet/klnds/o2iblnd/o2iblnd.h lustre-1.6.5.1/lnet/klnds/o2iblnd/o2iblnd.h
+--- lustre-1.6.5.1~/lnet/klnds/o2iblnd/o2iblnd.h 2008-03-14 19:18:05.000000000 +0100
++++ lustre-1.6.5.1/lnet/klnds/o2iblnd/o2iblnd.h 2008-09-16 15:51:29.000000000 +0200
+@@ -759,3 +759,13 @@
@@ -399,10 +399,10 @@
+ sg->length = len;
+}
+#endif
-diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
---- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
-+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
-@@ -626,9 +626,7 @@ kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_t
+diff -urNad lustre-1.6.5.1~/lnet/klnds/o2iblnd/o2iblnd_cb.c lustre-1.6.5.1/lnet/klnds/o2iblnd/o2iblnd_cb.c
+--- lustre-1.6.5.1~/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-03-28 08:12:34.000000000 +0100
++++ lustre-1.6.5.1/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-09-16 15:51:29.000000000 +0200
+@@ -626,9 +626,7 @@
fragnob = min((int)(iov->iov_len - offset), nob);
fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -413,7 +413,7 @@
sg++;
if (offset + fragnob < iov->iov_len) {
-@@ -691,11 +689,10 @@ kiblnd_setup_rd_kiov (lnet_ni_t *ni, kib
+@@ -691,11 +689,10 @@
fragnob = min((int)(kiov->kiov_len - offset), nob);
memset(sg, 0, sizeof(*sg));
@@ -428,10 +428,10 @@
offset = 0;
kiov++;
nkiov--;
-diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
---- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c
-+++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
-@@ -113,9 +113,51 @@ kib_tunables_t kiblnd_tunables = {
+diff -urNad lustre-1.6.5.1~/lnet/klnds/o2iblnd/o2iblnd_modparams.c lustre-1.6.5.1/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2007-09-10 17:35:53.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
+@@ -113,9 +113,51 @@
static char ipif_basename_space[32];
@@ -484,7 +484,7 @@
.procname = "service",
.data = &service,
.maxlen = sizeof(int),
-@@ -123,7 +165,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -123,7 +165,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -493,7 +493,7 @@
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -131,7 +173,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -131,7 +173,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -502,7 +502,7 @@
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -139,7 +181,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -139,7 +181,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -511,7 +511,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -147,7 +189,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -147,7 +189,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -520,7 +520,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -155,7 +197,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -155,7 +197,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -529,7 +529,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -163,7 +205,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -163,7 +205,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -538,7 +538,7 @@
.procname = "ipif_name",
.data = ipif_basename_space,
.maxlen = sizeof(ipif_basename_space),
-@@ -171,7 +213,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -171,7 +213,7 @@
.proc_handler = &proc_dostring
},
{
@@ -547,7 +547,7 @@
.procname = "retry_count",
.data = &retry_count,
.maxlen = sizeof(int),
-@@ -179,7 +221,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -179,7 +221,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -556,7 +556,7 @@
.procname = "rnr_retry_count",
.data = &rnr_retry_count,
.maxlen = sizeof(int),
-@@ -187,7 +229,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -187,7 +229,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -565,7 +565,7 @@
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -195,7 +237,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -195,7 +237,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -574,7 +574,7 @@
.procname = "concurrent_sends",
.data = &concurrent_sends,
.maxlen = sizeof(int),
-@@ -203,7 +245,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -203,7 +245,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -583,7 +583,7 @@
.procname = "ib_mtu",
.data = &ib_mtu,
.maxlen = sizeof(int),
-@@ -212,7 +254,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -212,7 +254,7 @@
},
#if IBLND_MAP_ON_DEMAND
{
@@ -592,7 +592,7 @@
.procname = "fmr_pool_size",
.data = &fmr_pool_size,
.maxlen = sizeof(int),
-@@ -220,7 +262,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -220,7 +262,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -601,7 +601,7 @@
.procname = "fmr_flush_trigger",
.data = &fmr_flush_trigger,
.maxlen = sizeof(int),
-@@ -228,7 +270,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -228,7 +270,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -610,7 +610,7 @@
.procname = "fmr_cache",
.data = &fmr_cache,
.maxlen = sizeof(int),
-@@ -241,7 +283,7 @@ static cfs_sysctl_table_t kiblnd_ctl_tab
+@@ -241,7 +283,7 @@
static cfs_sysctl_table_t kiblnd_top_ctl_table[] = {
{
@@ -619,10 +619,10 @@
.procname = "o2iblnd",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/openiblnd/openiblnd_modparams.c b/lnet/klnds/openiblnd/openiblnd_modparams.c
---- a/lnet/klnds/openiblnd/openiblnd_modparams.c
-+++ b/lnet/klnds/openiblnd/openiblnd_modparams.c
-@@ -83,9 +83,42 @@ kib_tunables_t kibnal_tunables = {
+diff -urNad lustre-1.6.5.1~/lnet/klnds/openiblnd/openiblnd_modparams.c lustre-1.6.5.1/lnet/klnds/openiblnd/openiblnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/openiblnd/openiblnd_modparams.c 2007-09-10 17:35:54.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
+@@ -83,9 +83,42 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -666,7 +666,7 @@
.procname = "ipif_basename",
.data = &ipif_basename,
.maxlen = 1024,
-@@ -93,7 +126,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -93,7 +126,7 @@
.proc_handler = &proc_dostring
},
{
@@ -675,7 +675,7 @@
.procname = "n_connd",
.data = &n_connd,
.maxlen = sizeof(int),
-@@ -101,7 +134,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -101,7 +134,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -684,7 +684,7 @@
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -109,7 +142,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -109,7 +142,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -693,7 +693,7 @@
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -117,7 +150,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -117,7 +150,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -702,7 +702,7 @@
.procname = "concurrent_peers",
.data = &concurrent_peers,
.maxlen = sizeof(int),
-@@ -125,7 +158,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -125,7 +158,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -711,7 +711,7 @@
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -133,7 +166,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -133,7 +166,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -720,7 +720,7 @@
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -141,7 +174,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -141,7 +174,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -729,7 +729,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -149,7 +182,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -149,7 +182,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -738,7 +738,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -157,7 +190,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -157,7 +190,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -747,7 +747,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -165,7 +198,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -165,7 +198,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -756,7 +756,7 @@
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -177,7 +210,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -177,7 +210,7 @@
static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
{
@@ -765,10 +765,10 @@
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/ptllnd/ptllnd_modparams.c b/lnet/klnds/ptllnd/ptllnd_modparams.c
---- a/lnet/klnds/ptllnd/ptllnd_modparams.c
-+++ b/lnet/klnds/ptllnd/ptllnd_modparams.c
-@@ -134,9 +134,54 @@ kptllnd_init_strtunable(char **str_param
+diff -urNad lustre-1.6.5.1~/lnet/klnds/ptllnd/ptllnd_modparams.c lustre-1.6.5.1/lnet/klnds/ptllnd/ptllnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/ptllnd/ptllnd_modparams.c 2007-09-27 04:30:24.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
+@@ -134,9 +134,54 @@
}
#endif
@@ -824,7 +824,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -144,15 +189,15 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -144,15 +189,15 @@
.proc_handler = &proc_dointvec
},
{
@@ -843,7 +843,7 @@
.procname = "max_procs_per_node",
.data = &max_procs_per_node,
.maxlen = sizeof(int),
-@@ -160,7 +205,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -160,7 +205,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -852,7 +852,7 @@
.procname = "checksum",
.data = &checksum,
.maxlen = sizeof(int),
-@@ -168,7 +213,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -168,7 +213,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -861,7 +861,7 @@
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -176,7 +221,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -176,7 +221,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -870,7 +870,7 @@
.procname = "portal",
.data = &portal,
.maxlen = sizeof(int),
-@@ -184,7 +229,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -184,7 +229,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -879,7 +879,7 @@
.procname = "pid",
.data = &pid,
.maxlen = sizeof(int),
-@@ -192,7 +237,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -192,7 +237,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -888,7 +888,7 @@
.procname = "rxb_npages",
.data = &rxb_npages,
.maxlen = sizeof(int),
-@@ -200,7 +245,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -200,7 +245,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -897,7 +897,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -208,7 +253,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -208,7 +253,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -906,7 +906,7 @@
.procname = "peercredits",
.data = &peercredits,
.maxlen = sizeof(int),
-@@ -216,7 +261,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -216,7 +261,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -915,7 +915,7 @@
.procname = "max_msg_size",
.data = &max_msg_size,
.maxlen = sizeof(int),
-@@ -224,7 +269,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -224,7 +269,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -924,7 +924,7 @@
.procname = "peer_hash_table_size",
.data = &peer_hash_table_size,
.maxlen = sizeof(int),
-@@ -232,7 +277,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -232,7 +277,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -933,7 +933,7 @@
.procname = "reschedule_loops",
.data = &reschedule_loops,
.maxlen = sizeof(int),
-@@ -240,7 +285,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -240,7 +285,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -942,7 +942,7 @@
.procname = "ack_puts",
.data = &ack_puts,
.maxlen = sizeof(int),
-@@ -249,7 +294,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -249,7 +294,7 @@
},
#ifdef CRAY_XT3
{
@@ -951,7 +951,7 @@
.procname = "ptltrace_on_timeout",
.data = &ptltrace_on_timeout,
.maxlen = sizeof(int),
-@@ -257,7 +302,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -257,7 +302,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -960,7 +960,7 @@
.procname = "ptltrace_basename",
.data = ptltrace_basename_space,
.maxlen = sizeof(ptltrace_basename_space),
-@@ -268,7 +313,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -268,7 +313,7 @@
#endif
#ifdef PJK_DEBUGGING
{
@@ -969,7 +969,7 @@
.procname = "simulation_bitmap",
.data = &simulation_bitmap,
.maxlen = sizeof(int),
-@@ -282,7 +327,7 @@ static cfs_sysctl_table_t kptllnd_ctl_ta
+@@ -282,7 +327,7 @@
static cfs_sysctl_table_t kptllnd_top_ctl_table[] = {
{
@@ -978,9 +978,9 @@
.procname = "ptllnd",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/qswlnd/qswlnd_modparams.c b/lnet/klnds/qswlnd/qswlnd_modparams.c
---- a/lnet/klnds/qswlnd/qswlnd_modparams.c
-+++ b/lnet/klnds/qswlnd/qswlnd_modparams.c
+diff -urNad lustre-1.6.5.1~/lnet/klnds/qswlnd/qswlnd_modparams.c lustre-1.6.5.1/lnet/klnds/qswlnd/qswlnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/qswlnd/qswlnd_modparams.c 2007-09-10 17:35:55.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
@@ -1,4 +1,7 @@
/*
+ * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
@@ -989,7 +989,7 @@
* Copyright (C) 2002-2004 Cluster File Systems, Inc.
* Author: Eric Barton <eric at bartonsoftware.com>
*
-@@ -84,9 +87,45 @@ kqswnal_tunables_t kqswnal_tunables = {
+@@ -84,9 +87,45 @@
};
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -1036,7 +1036,7 @@
.procname = "tx_maxcontig",
.data = &tx_maxcontig,
.maxlen = sizeof (int),
-@@ -94,7 +133,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -94,7 +133,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1045,7 +1045,7 @@
.procname = "ntxmsgs",
.data = &ntxmsgs,
.maxlen = sizeof (int),
-@@ -102,7 +141,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -102,7 +141,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1054,7 +1054,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof (int),
-@@ -110,7 +149,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -110,7 +149,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1063,7 +1063,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof (int),
-@@ -118,7 +157,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -118,7 +157,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1072,7 +1072,7 @@
.procname = "nrxmsgs_large",
.data = &nrxmsgs_large,
.maxlen = sizeof (int),
-@@ -126,7 +165,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -126,7 +165,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1081,7 +1081,7 @@
.procname = "ep_envelopes_large",
.data = &ep_envelopes_large,
.maxlen = sizeof (int),
-@@ -134,7 +173,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -134,7 +173,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1090,7 +1090,7 @@
.procname = "nrxmsgs_small",
.data = &nrxmsgs_small,
.maxlen = sizeof (int),
-@@ -142,7 +181,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -142,7 +181,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1099,7 +1099,7 @@
.procname = "ep_envelopes_small",
.data = &ep_envelopes_small,
.maxlen = sizeof (int),
-@@ -150,7 +189,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -150,7 +189,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1108,7 +1108,7 @@
.procname = "optimized_puts",
.data = &optimized_puts,
.maxlen = sizeof (int),
-@@ -158,7 +197,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -158,7 +197,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1117,7 +1117,7 @@
.procname = "optimized_gets",
.data = &optimized_gets,
.maxlen = sizeof (int),
-@@ -167,7 +206,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -167,7 +206,7 @@
},
#if KQSW_CKSUM
{
@@ -1126,7 +1126,7 @@
.procname = "inject_csum_error",
.data = &inject_csum_error,
.maxlen = sizeof (int),
-@@ -180,7 +219,7 @@ static cfs_sysctl_table_t kqswnal_ctl_ta
+@@ -180,7 +219,7 @@
static cfs_sysctl_table_t kqswnal_top_ctl_table[] = {
{
@@ -1135,10 +1135,10 @@
.procname = "qswnal",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/ralnd/ralnd_modparams.c b/lnet/klnds/ralnd/ralnd_modparams.c
---- a/lnet/klnds/ralnd/ralnd_modparams.c
-+++ b/lnet/klnds/ralnd/ralnd_modparams.c
-@@ -72,9 +72,37 @@ kra_tunables_t kranal_tunables = {
+diff -urNad lustre-1.6.5.1~/lnet/klnds/ralnd/ralnd_modparams.c lustre-1.6.5.1/lnet/klnds/ralnd/ralnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/ralnd/ralnd_modparams.c 2007-08-02 10:30:12.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/ralnd/ralnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
+@@ -72,9 +72,37 @@
};
#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
@@ -1177,7 +1177,7 @@
.procname = "n_connd",
.data = &n_connd,
.maxlen = sizeof(int),
-@@ -82,7 +110,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -82,7 +110,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1186,7 +1186,7 @@
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -90,7 +118,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -90,7 +118,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1195,7 +1195,7 @@
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -98,7 +126,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -98,7 +126,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1204,7 +1204,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -106,7 +134,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -106,7 +134,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1213,7 +1213,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -114,7 +142,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -114,7 +142,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1222,7 +1222,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -122,7 +150,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -122,7 +150,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1231,7 +1231,7 @@
.procname = "fma_cq_size",
.data = &fma_cq_size,
.maxlen = sizeof(int),
-@@ -130,7 +158,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -130,7 +158,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1240,7 +1240,7 @@
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -138,7 +166,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -138,7 +166,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1249,7 +1249,7 @@
.procname = "max_immediate",
.data = &max_immediate,
.maxlen = sizeof(int),
-@@ -150,7 +178,7 @@ static cfs_sysctl_table_t kranal_ctl_tab
+@@ -150,7 +178,7 @@
static cfs_sysctl_table_t kranal_top_ctl_table[] = {
{
@@ -1258,15 +1258,25 @@
.procname = "ranal",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/klnds/socklnd/socklnd_lib-linux.c b/lnet/klnds/socklnd/socklnd_lib-linux.c
---- a/lnet/klnds/socklnd/socklnd_lib-linux.c
-+++ b/lnet/klnds/socklnd/socklnd_lib-linux.c
-@@ -5,11 +5,232 @@
+diff -urNad lustre-1.6.5.1~/lnet/klnds/socklnd/socklnd_lib-linux.c lustre-1.6.5.1/lnet/klnds/socklnd/socklnd_lib-linux.c
+--- lustre-1.6.5.1~/lnet/klnds/socklnd/socklnd_lib-linux.c 2007-09-11 21:39:20.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-09-16 15:51:29.000000000 +0200
+@@ -5,197 +5,244 @@
#include "socklnd.h"
# if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
-static cfs_sysctl_table_t ksocknal_ctl_table[21];
-+
+
+-cfs_sysctl_table_t ksocknal_top_ctl_table[] = {
+- {
+- .ctl_name = 200,
+- .procname = "socknal",
+- .data = NULL,
+- .maxlen = 0,
+- .mode = 0555,
+- .child = ksocknal_ctl_table
+- },
+- { 0 }
+#ifndef HAVE_SYSCTL_UNNUMBERED
+
+#define CTL_SOCKLND 209
@@ -1292,10 +1302,15 @@
+ SOCKLND_BACKOFF_INIT,
+ SOCKLND_BACKOFF_MAX,
+ SOCKLND_PROTOCOL
-+};
+ };
+#else
+#define CTL_SOCKLND CTL_UNNUMBERED
-+
+
+-int
+-ksocknal_lib_tunables_init ()
+-{
+- int i = 0;
+- int j = 1;
+#define SOCKLND_TIMEOUT CTL_UNNUMBERED
+#define SOCKLND_CREDITS CTL_UNNUMBERED
+#define SOCKLND_PEER_CREDITS CTL_UNNUMBERED
@@ -1317,370 +1332,263 @@
+#define SOCKLND_BACKOFF_MAX CTL_UNNUMBERED
+#define SOCKLND_PROTOCOL CTL_UNNUMBERED
+#endif
-+
+
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+static cfs_sysctl_table_t ksocknal_ctl_table[] = {
+ {
+ .ctl_name = SOCKLND_TIMEOUT,
-+ .procname = "timeout",
-+ .data = ksocknal_tunables.ksnd_timeout,
-+ .maxlen = sizeof (int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "timeout",
+ .data = ksocknal_tunables.ksnd_timeout,
+ .maxlen = sizeof (int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_CREDITS,
-+ .procname = "credits",
-+ .data = ksocknal_tunables.ksnd_credits,
-+ .maxlen = sizeof (int),
-+ .mode = 0444,
-+ .proc_handler = &proc_dointvec
+ .procname = "credits",
+ .data = ksocknal_tunables.ksnd_credits,
+ .maxlen = sizeof (int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_PEER_CREDITS,
-+ .procname = "peer_credits",
-+ .data = ksocknal_tunables.ksnd_peercredits,
-+ .maxlen = sizeof (int),
-+ .mode = 0444,
-+ .proc_handler = &proc_dointvec
+ .procname = "peer_credits",
+ .data = ksocknal_tunables.ksnd_peercredits,
+ .maxlen = sizeof (int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_NCONNDS,
-+ .procname = "nconnds",
-+ .data = ksocknal_tunables.ksnd_nconnds,
-+ .maxlen = sizeof (int),
-+ .mode = 0444,
-+ .proc_handler = &proc_dointvec
+ .procname = "nconnds",
+ .data = ksocknal_tunables.ksnd_nconnds,
+ .maxlen = sizeof (int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_RECONNECTS_MIN,
-+ .procname = "min_reconnectms",
-+ .data = ksocknal_tunables.ksnd_min_reconnectms,
-+ .maxlen = sizeof (int),
-+ .mode = 0444,
-+ .proc_handler = &proc_dointvec
+ .procname = "min_reconnectms",
+ .data = ksocknal_tunables.ksnd_min_reconnectms,
+ .maxlen = sizeof (int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_RECONNECTS_MAX,
-+ .procname = "max_reconnectms",
-+ .data = ksocknal_tunables.ksnd_max_reconnectms,
-+ .maxlen = sizeof (int),
-+ .mode = 0444,
-+ .proc_handler = &proc_dointvec
+ .procname = "max_reconnectms",
+ .data = ksocknal_tunables.ksnd_max_reconnectms,
+ .maxlen = sizeof (int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_EAGER_ACK,
-+ .procname = "eager_ack",
-+ .data = ksocknal_tunables.ksnd_eager_ack,
-+ .maxlen = sizeof (int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "eager_ack",
+ .data = ksocknal_tunables.ksnd_eager_ack,
+ .maxlen = sizeof (int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_ZERO_COPY,
-+ .procname = "zero_copy",
-+ .data = ksocknal_tunables.ksnd_zc_min_frag,
-+ .maxlen = sizeof (int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "zero_copy",
+ .data = ksocknal_tunables.ksnd_zc_min_frag,
+ .maxlen = sizeof (int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_TYPED,
-+ .procname = "typed",
-+ .data = ksocknal_tunables.ksnd_typed_conns,
-+ .maxlen = sizeof (int),
-+ .mode = 0444,
-+ .proc_handler = &proc_dointvec
+ .procname = "typed",
+ .data = ksocknal_tunables.ksnd_typed_conns,
+ .maxlen = sizeof (int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_BULK_MIN,
-+ .procname = "min_bulk",
-+ .data = ksocknal_tunables.ksnd_min_bulk,
-+ .maxlen = sizeof (int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "min_bulk",
+ .data = ksocknal_tunables.ksnd_min_bulk,
+ .maxlen = sizeof (int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_RX_BUFFER_SIZE,
-+ .procname = "rx_buffer_size",
-+ .data = ksocknal_tunables.ksnd_rx_buffer_size,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "rx_buffer_size",
+ .data = ksocknal_tunables.ksnd_rx_buffer_size,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_TX_BUFFER_SIZE,
-+ .procname = "tx_buffer_size",
-+ .data = ksocknal_tunables.ksnd_tx_buffer_size,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "tx_buffer_size",
+ .data = ksocknal_tunables.ksnd_tx_buffer_size,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_NAGLE,
-+ .procname = "nagle",
-+ .data = ksocknal_tunables.ksnd_nagle,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "nagle",
+ .data = ksocknal_tunables.ksnd_nagle,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+ },
-+#ifdef CPU_AFFINITY
+ #ifdef CPU_AFFINITY
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ {
+ .ctl_name = SOCKLND_IRQ_AFFINITY,
-+ .procname = "irq_affinity",
-+ .data = ksocknal_tunables.ksnd_irq_affinity,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "irq_affinity",
+ .data = ksocknal_tunables.ksnd_irq_affinity,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+ },
-+#endif
+ #endif
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ {
+ .ctl_name = SOCKLND_KEEPALIVE_IDLE,
-+ .procname = "keepalive_idle",
-+ .data = ksocknal_tunables.ksnd_keepalive_idle,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "keepalive_idle",
+ .data = ksocknal_tunables.ksnd_keepalive_idle,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_KEEPALIVE_COUNT,
-+ .procname = "keepalive_count",
-+ .data = ksocknal_tunables.ksnd_keepalive_count,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "keepalive_count",
+ .data = ksocknal_tunables.ksnd_keepalive_count,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_KEEPALIVE_INTVL,
-+ .procname = "keepalive_intvl",
-+ .data = ksocknal_tunables.ksnd_keepalive_intvl,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "keepalive_intvl",
+ .data = ksocknal_tunables.ksnd_keepalive_intvl,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+ },
-+#ifdef SOCKNAL_BACKOFF
+ #ifdef SOCKNAL_BACKOFF
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ {
+ .ctl_name = SOCKLND_BACKOFF_INIT,
-+ .procname = "backoff_init",
-+ .data = ksocknal_tunables.ksnd_backoff_init,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "backoff_init",
+ .data = ksocknal_tunables.ksnd_backoff_init,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ },
+ {
+ .ctl_name = SOCKLND_BACKOFF_MAX,
-+ .procname = "backoff_max",
-+ .data = ksocknal_tunables.ksnd_backoff_max,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "backoff_max",
+ .data = ksocknal_tunables.ksnd_backoff_max,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+ }
-+#endif
-+#if SOCKNAL_VERSION_DEBUG
+ #endif
+ #if SOCKNAL_VERSION_DEBUG
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
+- .ctl_name = j++,
+ {
+ .ctl_name = SOCKLND_PROTOCOL,
-+ .procname = "protocol",
-+ .data = ksocknal_tunables.ksnd_protocol,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec
+ .procname = "protocol",
+ .data = ksocknal_tunables.ksnd_protocol,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+- };
+ },
-+#endif
+ #endif
+- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) { 0 };
+ {0}
+};
-+
-
- cfs_sysctl_table_t ksocknal_top_ctl_table[] = {
- {
-- .ctl_name = 200,
-+ .ctl_name = CTL_SOCKLND,
- .procname = "socknal",
- .data = NULL,
- .maxlen = 0,
-@@ -22,180 +243,6 @@ int
- int
- ksocknal_lib_tunables_init ()
- {
-- int i = 0;
-- int j = 1;
--
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "timeout",
-- .data = ksocknal_tunables.ksnd_timeout,
-- .maxlen = sizeof (int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "credits",
-- .data = ksocknal_tunables.ksnd_credits,
-- .maxlen = sizeof (int),
-- .mode = 0444,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "peer_credits",
-- .data = ksocknal_tunables.ksnd_peercredits,
-- .maxlen = sizeof (int),
-- .mode = 0444,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "nconnds",
-- .data = ksocknal_tunables.ksnd_nconnds,
-- .maxlen = sizeof (int),
-- .mode = 0444,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "min_reconnectms",
-- .data = ksocknal_tunables.ksnd_min_reconnectms,
-- .maxlen = sizeof (int),
-- .mode = 0444,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "max_reconnectms",
-- .data = ksocknal_tunables.ksnd_max_reconnectms,
-- .maxlen = sizeof (int),
-- .mode = 0444,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "eager_ack",
-- .data = ksocknal_tunables.ksnd_eager_ack,
-- .maxlen = sizeof (int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "zero_copy",
-- .data = ksocknal_tunables.ksnd_zc_min_frag,
-- .maxlen = sizeof (int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "typed",
-- .data = ksocknal_tunables.ksnd_typed_conns,
-- .maxlen = sizeof (int),
-- .mode = 0444,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "min_bulk",
-- .data = ksocknal_tunables.ksnd_min_bulk,
-- .maxlen = sizeof (int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "rx_buffer_size",
-- .data = ksocknal_tunables.ksnd_rx_buffer_size,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "tx_buffer_size",
-- .data = ksocknal_tunables.ksnd_tx_buffer_size,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "nagle",
-- .data = ksocknal_tunables.ksnd_nagle,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
--#ifdef CPU_AFFINITY
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "irq_affinity",
-- .data = ksocknal_tunables.ksnd_irq_affinity,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
--#endif
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "keepalive_idle",
-- .data = ksocknal_tunables.ksnd_keepalive_idle,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "keepalive_count",
-- .data = ksocknal_tunables.ksnd_keepalive_count,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "keepalive_intvl",
-- .data = ksocknal_tunables.ksnd_keepalive_intvl,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
--#ifdef SOCKNAL_BACKOFF
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "backoff_init",
-- .data = ksocknal_tunables.ksnd_backoff_init,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "backoff_max",
-- .data = ksocknal_tunables.ksnd_backoff_max,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
--#endif
--#if SOCKNAL_VERSION_DEBUG
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) {
-- .ctl_name = j++,
-- .procname = "protocol",
-- .data = ksocknal_tunables.ksnd_protocol,
-- .maxlen = sizeof(int),
-- .mode = 0644,
-- .proc_handler = &proc_dointvec
-- };
--#endif
-- ksocknal_ctl_table[i++] = (cfs_sysctl_table_t) { 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,
++ .procname = "socknal",
++ .data = NULL,
++ .maxlen = 0,
++ .mode = 0555,
++ .child = ksocknal_ctl_table
++ },
++ { 0 }
++};
++
++int
++ksocknal_lib_tunables_init ()
++{
ksocknal_tunables.ksnd_sysctl =
cfs_register_sysctl_table(ksocknal_top_ctl_table, 0);
-diff --git a/lnet/klnds/viblnd/viblnd_modparams.c b/lnet/klnds/viblnd/viblnd_modparams.c
---- a/lnet/klnds/viblnd/viblnd_modparams.c
-+++ b/lnet/klnds/viblnd/viblnd_modparams.c
-@@ -125,6 +125,56 @@ kib_tunables_t kibnal_tunables = {
+diff -urNad lustre-1.6.5.1~/lnet/klnds/viblnd/viblnd_modparams.c lustre-1.6.5.1/lnet/klnds/viblnd/viblnd_modparams.c
+--- lustre-1.6.5.1~/lnet/klnds/viblnd/viblnd_modparams.c 2007-09-27 04:30:24.000000000 +0200
++++ lustre-1.6.5.1/lnet/klnds/viblnd/viblnd_modparams.c 2008-09-16 15:51:29.000000000 +0200
+@@ -125,6 +125,56 @@
#endif
};
@@ -1737,7 +1645,7 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
static char hca_basename_space[32];
-@@ -132,7 +182,7 @@ static char ipif_basename_space[32];
+@@ -132,7 +182,7 @@
static cfs_sysctl_table_t kibnal_ctl_table[] = {
{
@@ -1746,7 +1654,7 @@
.procname = "service_number",
.data = &service_number,
.maxlen = sizeof(int),
-@@ -140,7 +190,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -140,7 +190,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1755,7 +1663,7 @@
.procname = "min_reconnect_interval",
.data = &min_reconnect_interval,
.maxlen = sizeof(int),
-@@ -148,7 +198,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -148,7 +198,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1764,7 +1672,7 @@
.procname = "max_reconnect_interval",
.data = &max_reconnect_interval,
.maxlen = sizeof(int),
-@@ -156,7 +206,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -156,7 +206,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1773,7 +1681,7 @@
.procname = "concurrent_peers",
.data = &concurrent_peers,
.maxlen = sizeof(int),
-@@ -164,7 +214,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -164,7 +214,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1782,7 +1690,7 @@
.procname = "cksum",
.data = &cksum,
.maxlen = sizeof(int),
-@@ -172,7 +222,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -172,7 +222,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1791,7 +1699,7 @@
.procname = "timeout",
.data = &timeout,
.maxlen = sizeof(int),
-@@ -180,7 +230,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -180,7 +230,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1800,7 +1708,7 @@
.procname = "ntx",
.data = &ntx,
.maxlen = sizeof(int),
-@@ -188,7 +238,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -188,7 +238,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1809,7 +1717,7 @@
.procname = "credits",
.data = &credits,
.maxlen = sizeof(int),
-@@ -196,7 +246,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -196,7 +246,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1818,7 +1726,7 @@
.procname = "peer_credits",
.data = &peer_credits,
.maxlen = sizeof(int),
-@@ -204,7 +254,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -204,7 +254,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1827,7 +1735,7 @@
.procname = "arp_retries",
.data = &arp_retries,
.maxlen = sizeof(int),
-@@ -212,7 +262,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -212,7 +262,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1836,7 +1744,7 @@
.procname = "hca_basename",
.data = hca_basename_space,
.maxlen = sizeof(hca_basename_space),
-@@ -220,7 +270,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -220,7 +270,7 @@
.proc_handler = &proc_dostring
},
{
@@ -1845,7 +1753,7 @@
.procname = "ipif_basename",
.data = ipif_basename_space,
.maxlen = sizeof(ipif_basename_space),
-@@ -228,7 +278,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -228,7 +278,7 @@
.proc_handler = &proc_dostring
},
{
@@ -1854,7 +1762,7 @@
.procname = "local_ack_timeout",
.data = &local_ack_timeout,
.maxlen = sizeof(int),
-@@ -236,7 +286,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -236,7 +286,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1863,7 +1771,7 @@
.procname = "retry_cnt",
.data = &retry_cnt,
.maxlen = sizeof(int),
-@@ -244,7 +294,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -244,7 +294,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1872,7 +1780,7 @@
.procname = "rnr_cnt",
.data = &rnr_cnt,
.maxlen = sizeof(int),
-@@ -252,7 +302,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -252,7 +302,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1881,7 +1789,7 @@
.procname = "rnr_nak_timer",
.data = &rnr_nak_timer,
.maxlen = sizeof(int),
-@@ -260,7 +310,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -260,7 +310,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1890,7 +1798,7 @@
.procname = "keepalive",
.data = &keepalive,
.maxlen = sizeof(int),
-@@ -268,7 +318,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -268,7 +318,7 @@
.proc_handler = &proc_dointvec
},
{
@@ -1899,7 +1807,7 @@
.procname = "concurrent_sends",
.data = &concurrent_sends,
.maxlen = sizeof(int),
-@@ -277,7 +327,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -277,7 +327,7 @@
},
#if IBNAL_USE_FMR
{
@@ -1908,7 +1816,7 @@
.procname = "fmr_remaps",
.data = &fmr_remaps,
.maxlen = sizeof(int),
-@@ -290,7 +340,7 @@ static cfs_sysctl_table_t kibnal_ctl_tab
+@@ -290,7 +340,7 @@
static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
{
@@ -1917,10 +1825,10 @@
.procname = "vibnal",
.data = NULL,
.maxlen = 0,
-diff --git a/lnet/libcfs/linux/linux-curproc.c b/lnet/libcfs/linux/linux-curproc.c
---- a/lnet/libcfs/linux/linux-curproc.c
-+++ b/lnet/libcfs/linux/linux-curproc.c
-@@ -109,6 +109,19 @@ void cfs_curproc_cap_set(cfs_kernel_cap_
+diff -urNad lustre-1.6.5.1~/lnet/libcfs/linux/linux-curproc.c lustre-1.6.5.1/lnet/libcfs/linux/linux-curproc.c
+--- lustre-1.6.5.1~/lnet/libcfs/linux/linux-curproc.c 2007-02-10 01:04:59.000000000 +0100
++++ lustre-1.6.5.1/lnet/libcfs/linux/linux-curproc.c 2008-09-16 15:51:29.000000000 +0200
+@@ -109,6 +109,19 @@
current->cap_effective = cap;
}
@@ -1940,7 +1848,7 @@
EXPORT_SYMBOL(cfs_curproc_uid);
EXPORT_SYMBOL(cfs_curproc_pid);
EXPORT_SYMBOL(cfs_curproc_gid);
-@@ -121,7 +134,7 @@ EXPORT_SYMBOL(cfs_curproc_is_in_groups);
+@@ -121,7 +134,7 @@
EXPORT_SYMBOL(cfs_curproc_is_in_groups);
EXPORT_SYMBOL(cfs_curproc_cap_get);
EXPORT_SYMBOL(cfs_curproc_cap_set);
@@ -1949,10 +1857,10 @@
/*
* Local variables:
* c-indentation-style: "K&R"
-diff --git a/lnet/libcfs/linux/linux-proc.c b/lnet/libcfs/linux/linux-proc.c
---- a/lnet/libcfs/linux/linux-proc.c
-+++ b/lnet/libcfs/linux/linux-proc.c
-@@ -61,7 +61,8 @@ static cfs_sysctl_table_header_t *lnet_t
+diff -urNad lustre-1.6.5.1~/lnet/libcfs/linux/linux-proc.c lustre-1.6.5.1/lnet/libcfs/linux/linux-proc.c
+--- lustre-1.6.5.1~/lnet/libcfs/linux/linux-proc.c 2008-03-25 13:23:25.000000000 +0100
++++ lustre-1.6.5.1/lnet/libcfs/linux/linux-proc.c 2008-09-16 15:51:29.000000000 +0200
+@@ -61,7 +61,8 @@
static cfs_sysctl_table_header_t *lnet_table_header = NULL;
extern char lnet_upcall[1024];
@@ -1962,7 +1870,7 @@
enum {
PSDEV_DEBUG = 1, /* control debugging */
PSDEV_SUBSYSTEM_DEBUG, /* control debugging */
-@@ -80,8 +81,27 @@ enum {
+@@ -80,8 +81,27 @@
PSDEV_LNET_DAEMON_FILE, /* spool kernel debug buffer to file */
PSDEV_LNET_DEBUG_MB, /* size of debug buffer */
};
@@ -1991,7 +1899,7 @@
proc_call_handler(void *data, int write,
loff_t *ppos, void *buffer, size_t *lenp,
int (*handler)(void *data, int write,
-@@ -100,17 +120,7 @@ proc_call_handler(void *data, int write,
+@@ -100,17 +120,7 @@
}
return 0;
}
@@ -2010,7 +1918,7 @@
static int __proc_dobitmasks(void *data, int write,
loff_t pos, void *buffer, int nob)
-@@ -182,11 +192,12 @@ static int __proc_daemon_file(void *data
+@@ -182,11 +192,12 @@
DECLARE_PROC_HANDLER(proc_daemon_file)
@@ -2024,7 +1932,7 @@
int len = snprintf(tmpstr, sizeof(tmpstr), "%d",
trace_get_debug_mb());
-@@ -301,7 +312,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -301,7 +312,8 @@
.data = &libcfs_debug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2034,7 +1942,7 @@
},
{
.ctl_name = PSDEV_SUBSYSTEM_DEBUG,
-@@ -309,7 +321,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -309,7 +321,8 @@
.data = &libcfs_subsystem_debug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2044,7 +1952,7 @@
},
{
.ctl_name = PSDEV_PRINTK,
-@@ -317,7 +330,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -317,7 +330,8 @@
.data = &libcfs_printk,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2054,7 +1962,7 @@
},
{
.ctl_name = PSDEV_CONSOLE_RATELIMIT,
-@@ -325,30 +339,36 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -325,30 +339,36 @@
.data = &libcfs_console_ratelimit,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2096,7 +2004,7 @@
{
.ctl_name = PSDEV_DEBUG_PATH,
.procname = "debug_path",
-@@ -356,8 +376,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -356,8 +376,8 @@
.maxlen = sizeof(debug_file_path),
.mode = 0644,
.proc_handler = &proc_dostring,
@@ -2106,7 +2014,7 @@
{
.ctl_name = PSDEV_LNET_UPCALL,
.procname = "upcall",
-@@ -365,6 +385,7 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -365,6 +385,7 @@
.maxlen = sizeof(lnet_upcall),
.mode = 0644,
.proc_handler = &proc_dostring,
@@ -2114,7 +2022,7 @@
},
{
.ctl_name = PSDEV_LNET_MEMUSED,
-@@ -372,7 +393,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -372,7 +393,8 @@
.data = (int *)&libcfs_kmemory.counter,
.maxlen = sizeof(int),
.mode = 0444,
@@ -2124,7 +2032,7 @@
},
{
.ctl_name = PSDEV_LNET_CATASTROPHE,
-@@ -380,7 +402,8 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -380,7 +402,8 @@
.data = &libcfs_catastrophe,
.maxlen = sizeof(int),
.mode = 0444,
@@ -2134,7 +2042,7 @@
},
{
.ctl_name = PSDEV_LNET_PANIC_ON_LBUG,
-@@ -388,39 +411,50 @@ static cfs_sysctl_table_t lnet_table[] =
+@@ -388,39 +411,50 @@
.data = &libcfs_panic_on_lbug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2192,9 +2100,9 @@
};
int insert_proc(void)
-diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
---- a/lnet/lnet/router_proc.c
-+++ b/lnet/lnet/router_proc.c
+diff -urNad lustre-1.6.5.1~/lnet/lnet/router_proc.c lustre-1.6.5.1/lnet/lnet/router_proc.c
+--- lustre-1.6.5.1~/lnet/lnet/router_proc.c 2007-11-29 14:35:39.000000000 +0100
++++ lustre-1.6.5.1/lnet/lnet/router_proc.c 2008-09-16 15:51:29.000000000 +0200
@@ -32,12 +32,13 @@
/* this is really lnet_proc.c */
@@ -2215,7 +2123,7 @@
static int
lnet_router_proc_stats_read (char *page, char **start, off_t off,
-@@ -1007,6 +1008,12 @@ lnet_proc_init(void)
+@@ -1007,6 +1008,12 @@
{
struct proc_dir_entry *pde;
@@ -2228,7 +2136,7 @@
/* Initialize LNET_PROC_STATS */
pde = create_proc_entry (LNET_PROC_STATS, 0644, NULL);
if (pde == NULL) {
-@@ -1078,6 +1085,7 @@ lnet_proc_fini(void)
+@@ -1078,6 +1085,7 @@
remove_proc_entry(LNET_PROC_PEERS, 0);
remove_proc_entry(LNET_PROC_BUFFERS, 0);
remove_proc_entry(LNET_PROC_NIS, 0);
@@ -2236,16 +2144,23 @@
}
#else
-diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
---- a/lustre/autoconf/lustre-core.m4
-+++ b/lustre/autoconf/lustre-core.m4
-@@ -1068,14 +1068,15 @@ AC_DEFUN([LC_PAGE_CHECKED],
+diff -urNad lustre-1.6.5.1~/lustre/autoconf/lustre-core.m4 lustre-1.6.5.1/lustre/autoconf/lustre-core.m4
+--- lustre-1.6.5.1~/lustre/autoconf/lustre-core.m4 2008-06-26 05:05:21.000000000 +0200
++++ lustre-1.6.5.1/lustre/autoconf/lustre-core.m4 2008-09-16 15:54:59.000000000 +0200
+@@ -1068,14 +1068,30 @@
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
LB_LINUX_TRY_COMPILE([
-+ #include <linux/autoconf.h>
-+ #include <linux/mm_types.h>
- #include <linux/page-flags.h>
+- #include <linux/page-flags.h>
++ #include <linux/version.h>
++ #if KERNEL_VERSION_CODE < KERNEL_VERSION(2,6,22)
++ # include <linux/mm.h>
++ # include <linux/page-flags.h>
++ #else
++ # include <linux/autoconf.h>
++ # include <linux/mm_types.h>
++ # include <linux/page-flags.h>
++ #endif
],[
- #ifndef PageChecked
- #error PageChecked not defined in kernel
@@ -2253,15 +2168,24 @@
- #ifndef SetPageChecked
- #error SetPageChecked not defined in kernel
- #endif
-+ struct page *p;
-+
-+ /* 2.6.26 use function instead of define for it */
-+ SetPageChecked(p);
-+ PageChecked(p);
++ #if KERNEL_VERSION_CODE < KERNEL_VERSION(2,6,22)
++ # ifndef PageChecked
++ # error PageChecked not defined in kernel
++ # endif
++ # ifndef SetPageChecked
++ # error SetPageChecked not defined in kernel
++ # endif
++ #else
++ struct page *p;
++
++ /* 2.6.26 use function instead of define for it */
++ SetPageChecked(p);
++ PageChecked(p);
++ #endif
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PAGE_CHECKED, 1,
-@@ -1230,11 +1231,155 @@ LB_LINUX_TRY_COMPILE([
+@@ -1230,11 +1246,155 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -2422,7 +2346,7 @@
])
#
-@@ -1327,10 +1472,23 @@ AC_DEFUN([LC_PROG_LINUX],
+@@ -1327,10 +1487,23 @@
# 2.6.22
LC_INVALIDATE_BDEV_2ARG
@@ -2446,7 +2370,7 @@
])
#
-@@ -1508,6 +1666,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1511,6 +1684,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -2454,10 +2378,10 @@
],[
AC_MSG_RESULT([no])
])
-diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
---- a/lustre/include/liblustre.h
-+++ b/lustre/include/liblustre.h
-@@ -718,11 +718,13 @@ struct _cap_struct;
+diff -urNad lustre-1.6.5.1~/lustre/include/liblustre.h lustre-1.6.5.1/lustre/include/liblustre.h
+--- lustre-1.6.5.1~/lustre/include/liblustre.h 2008-04-24 09:07:44.000000000 +0200
++++ lustre-1.6.5.1/lustre/include/liblustre.h 2008-09-16 15:51:29.000000000 +0200
+@@ -718,11 +718,13 @@
struct _cap_struct;
typedef struct _cap_struct *cap_t;
typedef int cap_value_t;
@@ -2471,7 +2395,7 @@
typedef enum {
CAP_CLEAR=0,
CAP_SET=1
-@@ -732,10 +734,32 @@ typedef enum {
+@@ -732,11 +734,33 @@
#define CAP_DAC_READ_SEARCH 2
#define CAP_FOWNER 3
#define CAP_FSETID 4
@@ -2484,7 +2408,7 @@
cap_t cap_get_proc(void);
int cap_get_flag(cap_t, cap_value_t, cap_flag_t, cap_flag_value_t *);
-+
+
+/* XXX should be move into licfs */
+typedef __u32 cfs_cap_t;
+
@@ -2502,13 +2426,14 @@
+{
+ return (cfs_cap_t)data;
+}
-
++
static inline void libcfs_run_lbug_upcall(char *file, const char *fn,
const int l){}
-diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
---- a/lustre/include/linux/lustre_compat25.h
-+++ b/lustre/include/linux/lustre_compat25.h
-@@ -43,6 +43,28 @@ struct ll_iattr_struct {
+
+diff -urNad lustre-1.6.5.1~/lustre/include/linux/lustre_compat25.h lustre-1.6.5.1/lustre/include/linux/lustre_compat25.h
+--- lustre-1.6.5.1~/lustre/include/linux/lustre_compat25.h 2008-03-27 04:32:33.000000000 +0100
++++ lustre-1.6.5.1/lustre/include/linux/lustre_compat25.h 2008-09-16 15:51:29.000000000 +0200
+@@ -43,6 +43,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
#ifndef HAVE_SET_FS_PWD
@@ -2537,7 +2462,7 @@
static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
struct dentry *dentry)
{
-@@ -61,6 +83,7 @@ static inline void ll_set_fs_pwd(struct
+@@ -61,6 +83,7 @@
mntput(old_pwdmnt);
}
}
@@ -2545,7 +2470,7 @@
#else
#define ll_set_fs_pwd set_fs_pwd
#endif /* HAVE_SET_FS_PWD */
-@@ -538,5 +561,56 @@ int ll_unregister_blkdev(unsigned int de
+@@ -538,5 +561,56 @@
#define ll_invalidate_bdev(a,b) invalidate_bdev((a))
#endif
@@ -2602,10 +2527,10 @@
+
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
-diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
---- a/lustre/include/linux/lvfs.h
-+++ b/lustre/include/linux/lvfs.h
-@@ -47,7 +47,7 @@ struct lvfs_ucred {
+diff -urNad lustre-1.6.5.1~/lustre/include/linux/lvfs.h lustre-1.6.5.1/lustre/include/linux/lvfs.h
+--- lustre-1.6.5.1~/lustre/include/linux/lvfs.h 2007-07-26 08:24:10.000000000 +0200
++++ lustre-1.6.5.1/lustre/include/linux/lvfs.h 2008-09-16 15:51:29.000000000 +0200
+@@ -47,7 +47,7 @@
struct upcall_cache_entry *luc_uce;
__u32 luc_fsuid;
__u32 luc_fsgid;
@@ -2614,10 +2539,10 @@
__u32 luc_suppgid1;
__u32 luc_suppgid2;
__u32 luc_umask;
-diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h
---- a/lustre/include/lprocfs_status.h
-+++ b/lustre/include/lprocfs_status.h
-@@ -481,6 +481,8 @@ extern struct rw_semaphore _lprocfs_lock
+diff -urNad lustre-1.6.5.1~/lustre/include/lprocfs_status.h lustre-1.6.5.1/lustre/include/lprocfs_status.h
+--- lustre-1.6.5.1~/lustre/include/lprocfs_status.h 2008-04-18 06:47:52.000000000 +0200
++++ lustre-1.6.5.1/lustre/include/lprocfs_status.h 2008-09-16 15:51:29.000000000 +0200
+@@ -481,6 +481,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
} while(0)
@@ -2626,7 +2551,7 @@
#define LPROCFS_ENTRY_AND_CHECK(dp) do { \
typecheck(struct proc_dir_entry *, dp); \
LPROCFS_ENTRY(); \
-@@ -489,6 +491,13 @@ extern struct rw_semaphore _lprocfs_lock
+@@ -489,6 +491,13 @@
return -ENODEV; \
} \
} while(0)
@@ -2640,10 +2565,10 @@
/* You must use these macros when you want to refer to
* the import in a client obd_device for a lprocfs entry */
-diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h
---- a/lustre/include/lustre_log.h
-+++ b/lustre/include/lustre_log.h
-@@ -218,14 +218,6 @@ struct llog_ctxt {
+diff -urNad lustre-1.6.5.1~/lustre/include/lustre_log.h lustre-1.6.5.1/lustre/include/lustre_log.h
+--- lustre-1.6.5.1~/lustre/include/lustre_log.h 2007-08-24 13:12:48.000000000 +0200
++++ lustre-1.6.5.1/lustre/include/lustre_log.h 2008-09-16 15:51:29.000000000 +0200
+@@ -218,14 +218,6 @@
void *llog_proc_cb;
};
@@ -2658,7 +2583,7 @@
static inline void llog_gen_init(struct llog_ctxt *ctxt)
{
struct obd_device *obd = ctxt->loc_exp->exp_obd;
-@@ -329,7 +321,7 @@ static inline int llog_write_rec(struct
+@@ -329,7 +321,7 @@
int numcookies, void *buf, int idx)
{
struct llog_operations *lop;
@@ -2667,7 +2592,7 @@
int rc, buflen;
ENTRY;
-@@ -346,10 +338,10 @@ static inline int llog_write_rec(struct
+@@ -346,10 +338,10 @@
buflen = rec->lrh_len;
LASSERT(size_round(buflen) == buflen);
@@ -2681,7 +2606,7 @@
RETURN(rc);
}
-@@ -445,7 +437,7 @@ static inline int llog_create(struct llo
+@@ -445,7 +437,7 @@
struct llog_logid *logid, char *name)
{
struct llog_operations *lop;
@@ -2690,7 +2615,7 @@
int rc;
ENTRY;
-@@ -455,10 +447,10 @@ static inline int llog_create(struct llo
+@@ -455,10 +447,10 @@
if (lop->lop_create == NULL)
RETURN(-EOPNOTSUPP);
@@ -2703,10 +2628,10 @@
RETURN(rc);
}
-diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
---- a/lustre/include/lustre_mds.h
-+++ b/lustre/include/lustre_mds.h
-@@ -177,7 +177,7 @@ int mdc_readpage(struct obd_export *exp,
+diff -urNad lustre-1.6.5.1~/lustre/include/lustre_mds.h lustre-1.6.5.1/lustre/include/lustre_mds.h
+--- lustre-1.6.5.1~/lustre/include/lustre_mds.h 2008-04-24 06:41:00.000000000 +0200
++++ lustre-1.6.5.1/lustre/include/lustre_mds.h 2008-09-16 15:51:29.000000000 +0200
+@@ -177,7 +177,7 @@
struct page *, struct ptlrpc_request **);
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
const void *data, int datalen, int mode, __u32 uid, __u32 gid,
@@ -2715,10 +2640,10 @@
int mdc_unlink(struct obd_export *exp, struct mdc_op_data *data,
struct ptlrpc_request **request);
int mdc_link(struct obd_export *exp, struct mdc_op_data *data,
-diff --git a/lustre/llite/file.c b/lustre/llite/file.c
---- a/lustre/llite/file.c
-+++ b/lustre/llite/file.c
-@@ -1680,9 +1680,17 @@ static ssize_t ll_file_write(struct file
+diff -urNad lustre-1.6.5.1~/lustre/llite/file.c lustre-1.6.5.1/lustre/llite/file.c
+--- lustre-1.6.5.1~/lustre/llite/file.c 2008-09-16 15:51:29.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/file.c 2008-09-16 15:51:29.000000000 +0200
+@@ -1681,9 +1681,17 @@
/*
* Send file content (through pagecache) somewhere with helper
*/
@@ -2739,7 +2664,7 @@
{
struct inode *inode = in_file->f_dentry->d_inode;
struct ll_inode_info *lli = ll_i2info(inode);
-@@ -1691,8 +1699,7 @@ static ssize_t ll_file_sendfile(struct f
+@@ -1692,8 +1700,7 @@
struct ll_lock_tree_node *node;
struct ost_lvb lvb;
struct ll_ra_read bead;
@@ -2749,7 +2674,7 @@
__u64 kms;
ENTRY;
CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
-@@ -1708,8 +1715,14 @@ static ssize_t ll_file_sendfile(struct f
+@@ -1709,8 +1716,14 @@
in_file->f_ra.ra_pages = 0;
/* File with no objects, nothing to lock */
@@ -2766,7 +2691,7 @@
node = ll_node_from_inode(inode, *ppos, *ppos + count - 1, LCK_PR);
if (IS_ERR(node))
-@@ -1749,8 +1762,8 @@ static ssize_t ll_file_sendfile(struct f
+@@ -1750,8 +1763,8 @@
/* A glimpse is necessary to determine whether we return a
* short read (B) or some zeroes at the end of the buffer (C) */
ll_inode_size_unlock(inode, 1);
@@ -2777,7 +2702,7 @@
goto out;
} else {
/* region is within kms and, hence, within real file size (A) */
-@@ -1766,14 +1779,17 @@ static ssize_t ll_file_sendfile(struct f
+@@ -1767,14 +1780,17 @@
ll_ra_read_in(in_file, &bead);
/* BUG: 5972 */
file_accessed(in_file);
@@ -2798,7 +2723,7 @@
static int ll_lov_recreate_obj(struct inode *inode, struct file *file,
unsigned long arg)
-@@ -2915,7 +2931,9 @@ struct file_operations ll_file_operation
+@@ -2916,7 +2932,9 @@
.release = ll_file_release,
.mmap = ll_file_mmap,
.llseek = ll_file_seek,
@@ -2809,7 +2734,7 @@
.sendfile = ll_file_sendfile,
#endif
.fsync = ll_fsync,
-@@ -2931,7 +2949,7 @@ struct file_operations ll_file_operation
+@@ -2932,7 +2950,7 @@
.write = ll_file_write,
#ifdef HAVE_FILE_WRITEV
.writev = ll_file_writev,
@@ -2818,7 +2743,7 @@
.aio_write = ll_file_aio_write,
#endif
.ioctl = ll_file_ioctl,
-@@ -2939,7 +2957,9 @@ struct file_operations ll_file_operation
+@@ -2940,7 +2958,9 @@
.release = ll_file_release,
.mmap = ll_file_mmap,
.llseek = ll_file_seek,
@@ -2829,7 +2754,7 @@
.sendfile = ll_file_sendfile,
#endif
.fsync = ll_fsync,
-@@ -2960,7 +2980,7 @@ struct file_operations ll_file_operation
+@@ -2961,7 +2981,7 @@
.write = ll_file_write,
#ifdef HAVE_FILE_WRITEV
.writev = ll_file_writev,
@@ -2838,7 +2763,7 @@
.aio_write = ll_file_aio_write,
#endif
.ioctl = ll_file_ioctl,
-@@ -2968,7 +2988,9 @@ struct file_operations ll_file_operation
+@@ -2969,7 +2989,9 @@
.release = ll_file_release,
.mmap = ll_file_mmap,
.llseek = ll_file_seek,
@@ -2849,10 +2774,10 @@
.sendfile = ll_file_sendfile,
#endif
.fsync = ll_fsync,
-diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
---- a/lustre/llite/llite_internal.h
-+++ b/lustre/llite/llite_internal.h
-@@ -681,9 +681,6 @@ int ll_process_config(struct lustre_cfg
+diff -urNad lustre-1.6.5.1~/lustre/llite/llite_internal.h lustre-1.6.5.1/lustre/llite/llite_internal.h
+--- lustre-1.6.5.1~/lustre/llite/llite_internal.h 2008-04-26 16:30:54.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/llite_internal.h 2008-09-16 15:51:29.000000000 +0200
+@@ -681,9 +681,6 @@
/* llite/llite_nfs.c */
extern struct export_operations lustre_export_operations;
__u32 get_uuid2int(const char *name, int len);
@@ -2862,10 +2787,10 @@
/* llite/special.c */
extern struct inode_operations ll_special_inode_operations;
-diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
---- a/lustre/llite/llite_lib.c
-+++ b/lustre/llite/llite_lib.c
-@@ -1347,7 +1347,7 @@ static int ll_setattr_do_truncate(struct
+diff -urNad lustre-1.6.5.1~/lustre/llite/llite_lib.c lustre-1.6.5.1/lustre/llite/llite_lib.c
+--- lustre-1.6.5.1~/lustre/llite/llite_lib.c 2008-05-28 21:15:40.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/llite_lib.c 2008-09-16 15:51:29.000000000 +0200
+@@ -1347,7 +1347,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
if (rc != 0) {
@@ -2874,9 +2799,9 @@
ll_inode_size_unlock(inode, 0);
}
}
-diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
---- a/lustre/llite/llite_mmap.c
-+++ b/lustre/llite/llite_mmap.c
+diff -urNad lustre-1.6.5.1~/lustre/llite/llite_mmap.c lustre-1.6.5.1/lustre/llite/llite_mmap.c
+--- lustre-1.6.5.1~/lustre/llite/llite_mmap.c 2008-03-27 04:32:37.000000000 +0100
++++ lustre-1.6.5.1/lustre/llite/llite_mmap.c 2008-09-16 15:51:29.000000000 +0200
@@ -38,9 +38,6 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -2887,7 +2812,7 @@
#define DEBUG_SUBSYSTEM S_LLITE
-@@ -66,17 +63,10 @@ struct ll_lock_tree_node {
+@@ -66,18 +63,11 @@
struct inode *lt_inode;
};
@@ -2895,7 +2820,7 @@
+
int lt_get_mmap_locks(struct ll_lock_tree *tree,
unsigned long addr, size_t count);
--
+
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address,
- int *type);
@@ -2904,10 +2829,11 @@
-struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address,
- int unused);
-#endif
-
+-
struct ll_lock_tree_node * ll_node_from_inode(struct inode *inode, __u64 start,
__u64 end, ldlm_mode_t mode)
-@@ -302,7 +292,7 @@ static struct vm_area_struct * our_vma(u
+ {
+@@ -302,7 +292,7 @@
spin_lock(&mm->page_table_lock);
for(vma = find_vma(mm, addr);
vma != NULL && vma->vm_start < (addr + count); vma = vma->vm_next) {
@@ -2916,7 +2842,7 @@
vma->vm_flags & VM_SHARED) {
ret = vma;
break;
-@@ -350,53 +340,28 @@ int lt_get_mmap_locks(struct ll_lock_tre
+@@ -350,53 +340,28 @@
RETURN(0);
}
@@ -2976,7 +2902,7 @@
CDEBUG(D_MMAP, "nopage vma %p inode %lu, locking ["LPU64", "LPU64"]\n",
vma, inode->i_ino, policy.l_extent.start, policy.l_extent.end);
-@@ -404,26 +369,23 @@ struct page *ll_nopage(struct vm_area_st
+@@ -404,26 +369,23 @@
mode = mode_from_vma(vma);
old_mtime = LTIME_S(inode->i_mtime);
@@ -3010,7 +2936,7 @@
} else {
/* XXX change inode size without ll_inode_size_lock() held!
* there is a race condition with truncate path. (see
-@@ -445,38 +407,85 @@ struct page *ll_nopage(struct vm_area_st
+@@ -445,38 +407,85 @@
CDEBUG(D_INODE, "ino=%lu, updating i_size %llu\n",
inode->i_ino, i_size_read(inode));
}
@@ -3039,7 +2965,7 @@
+ *save_flags = vma->vm_flags & (VM_RAND_READ | VM_SEQ_READ);
vma->vm_flags &= ~ VM_SEQ_READ;
vma->vm_flags |= VM_RAND_READ;
-+
+
+ RETURN(1);
+}
+
@@ -3060,7 +2986,7 @@
+
+#ifndef HAVE_VM_OP_FAULT
+struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address,
-+ int *type)
++ int *type) {
+ struct lustre_handle lockh = { 0 };
+ int save_fags;
+ unsigned long pgoff;
@@ -3070,7 +2996,7 @@
+ pgoff = ((address - vma->vm_start) >> CFS_PAGE_SHIFT) + vma->vm_pgoff;
+ if(!ll_extent_tree_lock(vma, pgoff, &save_fags, &lockh))
+ RETURN(NOPAGE_SIGBUS);
-
++
page = filemap_nopage(vma, address, type);
LL_CDEBUG_PAGE(D_PAGE, page, "got addr %lu type %lx\n", address,
(long)type);
@@ -3105,7 +3031,7 @@
/* To avoid cancel the locks covering mmapped region for lock cache pressure,
* we track the mapped vma count by lli_mmap_cnt.
-@@ -542,9 +551,12 @@ static void ll_vm_close(struct vm_area_s
+@@ -542,9 +551,12 @@
}
}
@@ -3120,7 +3046,7 @@
#endif
static int ll_populate(struct vm_area_struct *area, unsigned long address,
unsigned long len, pgprot_t prot, unsigned long pgoff,
-@@ -566,47 +578,6 @@ static inline unsigned long file_to_user
+@@ -566,47 +578,6 @@
}
@@ -3168,7 +3094,7 @@
/* XXX put nice comment here. talk about __free_pte -> dirty pages and
* nopage's reference passing to the pte */
int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last)
-@@ -615,32 +586,21 @@ int ll_teardown_mmaps(struct address_spa
+@@ -615,32 +586,21 @@
ENTRY;
LASSERTF(last > first, "last "LPU64" first "LPU64"\n", last, first);
@@ -3205,7 +3131,7 @@
.populate = ll_populate,
#endif
};
-@@ -653,8 +613,7 @@ int ll_file_mmap(struct file * file, str
+@@ -653,8 +613,7 @@
ll_stats_ops_tally(ll_i2sbi(file->f_dentry->d_inode), LPROC_LL_MAP, 1);
rc = generic_file_mmap(file, vma);
if (rc == 0) {
@@ -3215,10 +3141,10 @@
if (!filemap_populate)
filemap_populate = vma->vm_ops->populate;
#endif
-diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
---- a/lustre/llite/llite_nfs.c
-+++ b/lustre/llite/llite_nfs.c
-@@ -40,11 +40,7 @@ __u32 get_uuid2int(const char *name, int
+diff -urNad lustre-1.6.5.1~/lustre/llite/llite_nfs.c lustre-1.6.5.1/lustre/llite/llite_nfs.c
+--- lustre-1.6.5.1~/lustre/llite/llite_nfs.c 2008-04-24 06:41:05.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/llite_nfs.c 2008-09-16 15:51:29.000000000 +0200
+@@ -40,11 +40,7 @@
return (key0 << 1);
}
@@ -3230,7 +3156,7 @@
{
struct ll_fid *iid = opaque;
-@@ -56,12 +52,10 @@ static int ll_nfs_test_inode(struct inod
+@@ -56,12 +52,10 @@
static struct inode * search_inode_for_lustre(struct super_block *sb,
unsigned long ino,
@@ -3244,7 +3170,7 @@
unsigned long valid = 0;
int eadatalen = 0, rc;
struct inode *inode = NULL;
-@@ -72,17 +66,15 @@ static struct inode * search_inode_for_l
+@@ -72,17 +66,15 @@
if (inode)
RETURN(inode);
@@ -3270,7 +3196,7 @@
if (rc) {
CERROR("failure %d inode %lu\n", rc, ino);
RETURN(ERR_PTR(rc));
-@@ -98,20 +90,23 @@ static struct inode * search_inode_for_l
+@@ -98,20 +90,23 @@
RETURN(inode);
}
@@ -3301,14 +3227,13 @@
if (IS_ERR(inode)) {
RETURN(ERR_PTR(PTR_ERR(inode)));
}
-@@ -125,40 +120,24 @@ static struct dentry *ll_iget_for_nfs(st
+@@ -125,40 +120,24 @@
iput(inode);
RETURN(ERR_PTR(-ESTALE));
}
+ RETURN(inode);
+}
-
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
++
+static struct dentry *ll_nfs_get_dentry(struct super_block *sb, void *data)
+{
+ __u32 *inump = (__u32*)data;
@@ -3318,7 +3243,8 @@
+ inode = ll_iget_for_nfs(sb, inump[0], inump[1]);
+ if (IS_ERR(inode))
+ RETURN((struct dentry *)inode);
-+
+
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
result = d_alloc_anon(inode);
if (!result) {
iput(inode);
@@ -3354,7 +3280,7 @@
ll_set_dd(result);
lock_dentry(result);
-@@ -173,80 +152,63 @@ static struct dentry *ll_iget_for_nfs(st
+@@ -173,80 +152,63 @@
}
RETURN(result);
@@ -3403,43 +3329,42 @@
- *datap++ = dentry->d_inode->i_ino;
- *datap++ = dentry->d_inode->i_generation;
- *datap++ = (__u32)(S_IFMT & dentry->d_inode->i_mode);
-+ struct dentry *result;
-
+-
- if (*lenp == 3 || S_ISDIR(dentry->d_inode->i_mode)) {
- *lenp = 3;
- return 1;
+- }
+- if (dentry->d_parent) {
+- *datap++ = dentry->d_parent->d_inode->i_ino;
+- *datap++ = (__u32)(S_IFMT & dentry->d_parent->d_inode->i_mode);
++ struct dentry *result;
+
+- *lenp = 5;
+- return 2;
+ result = generic_fh_to_parent(sb, fid, fh_len, fh_type,
+ ll_iget_for_nfs);
+ if(!IS_ERR(result)) {
+ ll_set_dd(result);
+ result->d_op = &ll_d_ops;
}
-- if (dentry->d_parent) {
-- *datap++ = dentry->d_parent->d_inode->i_ino;
-- *datap++ = (__u32)(S_IFMT & dentry->d_parent->d_inode->i_mode);
--
-- *lenp = 5;
-- return 2;
-- }
- *lenp = 3;
- return 1;
+ RETURN(result);
-+}
+ }
+-
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+-struct dentry *ll_get_dentry(struct super_block *sb, void *data)
+#else
+static struct dentry *ll_get_dentry(struct super_block *sb, void *data)
-+{
+ {
+- __u32 *inump = (__u32*)data;
+- return ll_iget_for_nfs(sb, inump[0], inump[1], S_IFREG);
+ return ll_nfs_get_dentry(sb, data);
}
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
--struct dentry *ll_get_dentry(struct super_block *sb, void *data)
--{
-- __u32 *inump = (__u32*)data;
-- return ll_iget_for_nfs(sb, inump[0], inump[1], S_IFREG);
--}
+-struct dentry *ll_get_parent(struct dentry *dchild)
+#endif
-
--struct dentry *ll_get_parent(struct dentry *dchild)
++
+static struct dentry *ll_get_parent(struct dentry *dchild)
{
struct ptlrpc_request *req = NULL;
@@ -3466,7 +3391,7 @@
0, 0, &req);
if (rc) {
CERROR("failure %d inode %lu get parent\n", rc, dir->i_ino);
-@@ -256,8 +218,9 @@ struct dentry *ll_get_parent(struct dent
+@@ -256,8 +218,9 @@
LASSERT((body->valid & OBD_MD_FLGENER) && (body->valid & OBD_MD_FLID));
@@ -3478,25 +3403,25 @@
if (IS_ERR(result))
rc = PTR_ERR(result);
-@@ -268,7 +231,11 @@ struct dentry *ll_get_parent(struct dent
+@@ -268,7 +231,11 @@
}
struct export_operations lustre_export_operations = {
- .get_parent = ll_get_parent,
- .get_dentry = ll_get_dentry,
+-};
+#ifdef HAVE_FH_TO_DENTRY
+ .fh_to_dentry = ll_fh_to_dentry,
+ .fh_to_parent = ll_fh_to_parent,
+#else
+ .get_dentry = ll_get_dentry,
-+#endif
+ #endif
+ .get_parent = ll_get_parent,
- };
--#endif
-diff --git a/lustre/llite/lloop.c b/lustre/llite/lloop.c
---- a/lustre/llite/lloop.c
-+++ b/lustre/llite/lloop.c
-@@ -299,7 +299,7 @@ err:
++};
+diff -urNad lustre-1.6.5.1~/lustre/llite/lloop.c lustre-1.6.5.1/lustre/llite/lloop.c
+--- lustre-1.6.5.1~/lustre/llite/lloop.c 2007-11-21 13:11:10.000000000 +0100
++++ lustre-1.6.5.1/lustre/llite/lloop.c 2008-09-16 15:51:29.000000000 +0200
+@@ -299,7 +299,7 @@
if (atomic_dec_and_test(&lo->lo_pending))
up(&lo->lo_bh_mutex);
out:
@@ -3505,7 +3430,7 @@
return 0;
inactive:
spin_unlock_irq(&lo->lo_lock);
-@@ -321,7 +321,7 @@ static inline void loop_handle_bio(struc
+@@ -321,7 +321,7 @@
{
int ret;
ret = do_bio_filebacked(lo, bio);
@@ -3514,10 +3439,10 @@
}
/*
-diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
---- a/lustre/llite/namei.c
-+++ b/lustre/llite/namei.c
-@@ -879,7 +879,7 @@ static int ll_new_node(struct inode *dir
+diff -urNad lustre-1.6.5.1~/lustre/llite/namei.c lustre-1.6.5.1/lustre/llite/namei.c
+--- lustre-1.6.5.1~/lustre/llite/namei.c 2008-04-24 06:41:06.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/namei.c 2008-09-16 15:51:29.000000000 +0200
+@@ -879,7 +879,7 @@
err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len,
mode, current->fsuid, current->fsgid,
@@ -3526,10 +3451,10 @@
if (err)
GOTO(err_exit, err);
-diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
---- a/lustre/llite/rw.c
-+++ b/lustre/llite/rw.c
-@@ -161,7 +161,7 @@ void ll_truncate(struct inode *inode)
+diff -urNad lustre-1.6.5.1~/lustre/llite/rw.c lustre-1.6.5.1/lustre/llite/rw.c
+--- lustre-1.6.5.1~/lustre/llite/rw.c 2008-04-03 05:23:43.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/rw.c 2008-09-16 15:51:29.000000000 +0200
+@@ -161,7 +161,7 @@
GOTO(out_unlock, 0);
}
@@ -3538,10 +3463,10 @@
if (!srvlock) {
struct ost_lvb lvb;
-diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
---- a/lustre/llite/symlink.c
-+++ b/lustre/llite/symlink.c
-@@ -156,8 +156,12 @@ static LL_FOLLOW_LINK_RETURN_TYPE ll_fol
+diff -urNad lustre-1.6.5.1~/lustre/llite/symlink.c lustre-1.6.5.1/lustre/llite/symlink.c
+--- lustre-1.6.5.1~/lustre/llite/symlink.c 2007-10-25 04:14:35.000000000 +0200
++++ lustre-1.6.5.1/lustre/llite/symlink.c 2008-09-16 15:51:29.000000000 +0200
+@@ -156,8 +156,12 @@
rc = ll_readlink_internal(inode, &request, &symname);
up(&lli->lli_size_sem);
if (rc) {
@@ -3554,10 +3479,10 @@
GOTO(out, rc);
}
-diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
---- a/lustre/lvfs/lvfs_linux.c
-+++ b/lustre/lvfs/lvfs_linux.c
-@@ -133,10 +133,10 @@ void push_ctxt(struct lvfs_run_ctxt *sav
+diff -urNad lustre-1.6.5.1~/lustre/lvfs/lvfs_linux.c lustre-1.6.5.1/lustre/lvfs/lvfs_linux.c
+--- lustre-1.6.5.1~/lustre/lvfs/lvfs_linux.c 2007-10-30 06:25:57.000000000 +0100
++++ lustre-1.6.5.1/lustre/lvfs/lvfs_linux.c 2008-09-16 15:51:29.000000000 +0200
+@@ -133,10 +133,10 @@
*/
save->fs = get_fs();
@@ -3571,7 +3496,7 @@
save->luc.luc_umask = current->fs->umask;
LASSERT(save->pwd);
-@@ -147,11 +147,11 @@ void push_ctxt(struct lvfs_run_ctxt *sav
+@@ -147,11 +147,11 @@
if (uc) {
save->luc.luc_fsuid = current->fsuid;
save->luc.luc_fsgid = current->fsgid;
@@ -3585,7 +3510,7 @@
push_group_info(save, uc->luc_uce);
}
current->fs->umask = 0; /* umask already applied on client */
-@@ -190,10 +190,10 @@ void pop_ctxt(struct lvfs_run_ctxt *save
+@@ -190,10 +190,10 @@
atomic_read(¤t->fs->pwdmnt->mnt_count));
*/
@@ -3600,7 +3525,7 @@
set_fs(saved->fs);
ll_set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd);
-@@ -204,7 +204,7 @@ void pop_ctxt(struct lvfs_run_ctxt *save
+@@ -204,7 +204,7 @@
if (uc) {
current->fsuid = saved->luc.luc_fsuid;
current->fsgid = saved->luc.luc_fsgid;
@@ -3609,10 +3534,10 @@
pop_group_info(saved, uc->luc_uce);
}
-diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
---- a/lustre/mdc/mdc_internal.h
-+++ b/lustre/mdc/mdc_internal.h
-@@ -28,7 +28,7 @@ void mdc_setattr_pack(struct ptlrpc_requ
+diff -urNad lustre-1.6.5.1~/lustre/mdc/mdc_internal.h lustre-1.6.5.1/lustre/mdc/mdc_internal.h
+--- lustre-1.6.5.1~/lustre/mdc/mdc_internal.h 2008-01-17 14:00:30.000000000 +0100
++++ lustre-1.6.5.1/lustre/mdc/mdc_internal.h 2008-09-16 15:51:29.000000000 +0200
+@@ -28,7 +28,7 @@
void *ea2, int ea2len);
void mdc_create_pack(struct ptlrpc_request *req, int offset,
struct mdc_op_data *op_data, const void *data, int datalen,
@@ -3621,10 +3546,10 @@
__u64 rdev);
void mdc_open_pack(struct ptlrpc_request *req, int offset,
struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
-diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
---- a/lustre/mdc/mdc_lib.c
-+++ b/lustre/mdc/mdc_lib.c
-@@ -46,7 +46,7 @@ void mdc_readdir_pack(struct ptlrpc_requ
+diff -urNad lustre-1.6.5.1~/lustre/mdc/mdc_lib.c lustre-1.6.5.1/lustre/mdc/mdc_lib.c
+--- lustre-1.6.5.1~/lustre/mdc/mdc_lib.c 2008-03-26 07:22:04.000000000 +0100
++++ lustre-1.6.5.1/lustre/mdc/mdc_lib.c 2008-09-16 15:51:29.000000000 +0200
+@@ -46,7 +46,7 @@
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
b->fsuid = current->fsuid;
b->fsgid = current->fsgid;
@@ -3633,7 +3558,7 @@
b->fid1 = *fid;
b->size = pg_off; /* !! */
b->suppgid = -1;
-@@ -59,7 +59,7 @@ static void mdc_pack_body(struct mds_bod
+@@ -59,7 +59,7 @@
b->fsuid = current->fsuid;
b->fsgid = current->fsgid;
@@ -3642,7 +3567,7 @@
}
void mdc_pack_req_body(struct ptlrpc_request *req, int offset,
-@@ -78,7 +78,7 @@ void mdc_pack_req_body(struct ptlrpc_req
+@@ -78,7 +78,7 @@
/* packing of MDS records */
void mdc_create_pack(struct ptlrpc_request *req, int offset,
struct mdc_op_data *op_data, const void *data, int datalen,
@@ -3651,7 +3576,7 @@
__u64 rdev)
{
struct mds_rec_create *rec;
-@@ -88,7 +88,7 @@ void mdc_create_pack(struct ptlrpc_reque
+@@ -88,7 +88,7 @@
rec->cr_opcode = REINT_CREATE;
rec->cr_fsuid = uid;
rec->cr_fsgid = gid;
@@ -3660,7 +3585,7 @@
rec->cr_fid = op_data->fid1;
memset(&rec->cr_replayfid, 0, sizeof(rec->cr_replayfid));
rec->cr_mode = mode;
-@@ -156,7 +156,7 @@ void mdc_open_pack(struct ptlrpc_request
+@@ -156,7 +156,7 @@
rec->cr_opcode = REINT_OPEN;
rec->cr_fsuid = current->fsuid;
rec->cr_fsgid = current->fsgid;
@@ -3669,7 +3594,7 @@
rec->cr_fid = op_data->fid1;
memset(&rec->cr_replayfid, 0, sizeof(rec->cr_replayfid));
rec->cr_mode = mode;
-@@ -230,7 +230,7 @@ void mdc_setattr_pack(struct ptlrpc_requ
+@@ -230,7 +230,7 @@
rec->sa_opcode = REINT_SETATTR;
rec->sa_fsuid = current->fsuid;
rec->sa_fsgid = current->fsgid;
@@ -3678,7 +3603,7 @@
rec->sa_fid = data->fid1;
rec->sa_suppgid = -1;
-@@ -274,7 +274,7 @@ void mdc_unlink_pack(struct ptlrpc_reque
+@@ -274,7 +274,7 @@
rec->ul_opcode = REINT_UNLINK;
rec->ul_fsuid = current->fsuid;
rec->ul_fsgid = current->fsgid;
@@ -3687,7 +3612,7 @@
rec->ul_mode = data->create_mode;
rec->ul_suppgid = data->suppgids[0];
rec->ul_fid1 = data->fid1;
-@@ -297,7 +297,7 @@ void mdc_link_pack(struct ptlrpc_request
+@@ -297,7 +297,7 @@
rec->lk_opcode = REINT_LINK;
rec->lk_fsuid = current->fsuid;
rec->lk_fsgid = current->fsgid;
@@ -3696,7 +3621,7 @@
rec->lk_suppgid1 = data->suppgids[0];
rec->lk_suppgid2 = data->suppgids[1];
rec->lk_fid1 = data->fid1;
-@@ -321,7 +321,7 @@ void mdc_rename_pack(struct ptlrpc_reque
+@@ -321,7 +321,7 @@
rec->rn_opcode = REINT_RENAME;
rec->rn_fsuid = current->fsuid;
rec->rn_fsgid = current->fsgid;
@@ -3705,7 +3630,7 @@
rec->rn_suppgid1 = data->suppgids[0];
rec->rn_suppgid2 = data->suppgids[1];
rec->rn_fid1 = data->fid1;
-@@ -345,7 +345,7 @@ void mdc_getattr_pack(struct ptlrpc_requ
+@@ -345,7 +345,7 @@
b->fsuid = current->fsuid;
b->fsgid = current->fsgid;
@@ -3714,10 +3639,10 @@
b->valid = valid;
b->flags = flags | MDS_BFLAG_EXT_FLAGS;
/* skip MDS_BFLAG_EXT_FLAGS to verify the "client < 1.4.7" case
-diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
---- a/lustre/mdc/mdc_reint.c
-+++ b/lustre/mdc/mdc_reint.c
-@@ -164,7 +164,7 @@ int mdc_setattr(struct obd_export *exp,
+diff -urNad lustre-1.6.5.1~/lustre/mdc/mdc_reint.c lustre-1.6.5.1/lustre/mdc/mdc_reint.c
+--- lustre-1.6.5.1~/lustre/mdc/mdc_reint.c 2008-02-18 13:43:18.000000000 +0100
++++ lustre-1.6.5.1/lustre/mdc/mdc_reint.c 2008-09-16 15:51:29.000000000 +0200
+@@ -164,7 +164,7 @@
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
const void *data, int datalen, int mode, __u32 uid, __u32 gid,
@@ -3726,10 +3651,10 @@
{
CFS_LIST_HEAD(cancels);
struct obd_device *obd = exp->exp_obd;
-diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
---- a/lustre/mgc/mgc_request.c
-+++ b/lustre/mgc/mgc_request.c
-@@ -395,7 +395,7 @@ static int mgc_fs_setup(struct obd_devic
+diff -urNad lustre-1.6.5.1~/lustre/mgc/mgc_request.c lustre-1.6.5.1/lustre/mgc/mgc_request.c
+--- lustre-1.6.5.1~/lustre/mgc/mgc_request.c 2008-04-24 13:54:15.000000000 +0200
++++ lustre-1.6.5.1/lustre/mgc/mgc_request.c 2008-09-16 15:51:29.000000000 +0200
+@@ -395,7 +395,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
@@ -3738,10 +3663,10 @@
strlen(MOUNT_CONFIGS_DIR));
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (IS_ERR(dentry)) {
-diff --git a/lustre/obdclass/linux/linux-module.c b/lustre/obdclass/linux/linux-module.c
---- a/lustre/obdclass/linux/linux-module.c
-+++ b/lustre/obdclass/linux/linux-module.c
-@@ -386,7 +386,7 @@ int class_procfs_init(void)
+diff -urNad lustre-1.6.5.1~/lustre/obdclass/linux/linux-module.c lustre-1.6.5.1/lustre/obdclass/linux/linux-module.c
+--- lustre-1.6.5.1~/lustre/obdclass/linux/linux-module.c 2007-11-13 21:43:24.000000000 +0100
++++ lustre-1.6.5.1/lustre/obdclass/linux/linux-module.c 2008-09-16 15:51:29.000000000 +0200
+@@ -386,7 +386,7 @@
ENTRY;
obd_sysctl_init();
@@ -3750,9 +3675,9 @@
if (!proc_lustre_root) {
printk(KERN_ERR
"LustreError: error registering /proc/fs/lustre\n");
-diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c
---- a/lustre/obdclass/linux/linux-sysctl.c
-+++ b/lustre/obdclass/linux/linux-sysctl.c
+diff -urNad lustre-1.6.5.1~/lustre/obdclass/linux/linux-sysctl.c lustre-1.6.5.1/lustre/obdclass/linux/linux-sysctl.c
+--- lustre-1.6.5.1~/lustre/obdclass/linux/linux-sysctl.c 2008-03-25 13:25:41.000000000 +0100
++++ lustre-1.6.5.1/lustre/obdclass/linux/linux-sysctl.c 2008-09-16 15:51:29.000000000 +0200
@@ -48,7 +48,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3764,7 +3689,7 @@
enum {
OBD_FAIL_LOC = 1, /* control test failures instrumentation */
-@@ -65,6 +67,22 @@ enum {
+@@ -65,6 +67,22 @@
OBD_DEBUG_PEER_ON_TIMEOUT, /* dump peer debug when RPC times out */
OBD_ALLOC_FAIL_RATE, /* memory allocation random failure rate */
};
@@ -3787,7 +3712,7 @@
int LL_PROC_PROTO(proc_fail_loc)
{
-@@ -98,11 +116,12 @@ int LL_PROC_PROTO(proc_alloc_fail_rate)
+@@ -98,11 +116,12 @@
return 0;
}
if (write) {
@@ -3802,7 +3727,7 @@
int len;
len = lprocfs_read_frac_helper(buf, sizeof(buf),
-@@ -111,7 +130,13 @@ int LL_PROC_PROTO(proc_alloc_fail_rate)
+@@ -111,7 +130,13 @@
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
@@ -3817,13 +3742,13 @@
return -EFAULT;
*lenp = len;
}
-@@ -122,99 +147,116 @@ int LL_PROC_PROTO(proc_alloc_fail_rate)
+@@ -122,100 +147,117 @@
int LL_PROC_PROTO(proc_memory_alloc)
{
-+ int len;
- char buf[22];
-- int len;
+- char buf[22];
+ int len;
++ char buf[22];
+ struct ctl_table dummy;
DECLARE_LL_PROC_PPOS_DECL;
@@ -3899,9 +3824,9 @@
int LL_PROC_PROTO(proc_mem_max)
{
-+ int len;
- char buf[22];
-- int len;
+- char buf[22];
+ int len;
++ char buf[22];
+ struct ctl_table dummy;
DECLARE_LL_PROC_PPOS_DECL;
@@ -3937,9 +3862,9 @@
int LL_PROC_PROTO(proc_pages_max)
{
-+ int len;
- char buf[22];
-- int len;
+- char buf[22];
+ int len;
++ char buf[22];
+ struct ctl_table dummy;
DECLARE_LL_PROC_PPOS_DECL;
@@ -3971,11 +3896,12 @@
+
+ return ll_proc_dostring(&dummy,write,filp,buffer,lenp, ppos);
}
-+
-
+
++
static cfs_sysctl_table_t obd_table[] = {
{
-@@ -231,7 +273,8 @@ static cfs_sysctl_table_t obd_table[] =
+ .ctl_name = OBD_FAIL_LOC,
+@@ -231,7 +273,8 @@
.data = &obd_fail_val,
.maxlen = sizeof(int),
.mode = 0644,
@@ -3985,7 +3911,7 @@
},
{
.ctl_name = OBD_TIMEOUT,
-@@ -247,7 +290,7 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -247,7 +290,7 @@
.data = &obd_debug_peer_on_timeout,
.maxlen = sizeof(int),
.mode = 0644,
@@ -3994,7 +3920,7 @@
},
{
.ctl_name = OBD_DUMP_ON_TIMEOUT,
-@@ -255,7 +298,7 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -255,7 +298,7 @@
.data = &obd_dump_on_timeout,
.maxlen = sizeof(int),
.mode = 0644,
@@ -4003,7 +3929,7 @@
},
{
.ctl_name = OBD_DUMP_ON_EVICTION,
-@@ -263,7 +306,7 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -263,7 +306,7 @@
.data = &obd_dump_on_eviction,
.maxlen = sizeof(int),
.mode = 0644,
@@ -4012,7 +3938,7 @@
},
{
.ctl_name = OBD_MEMUSED,
-@@ -271,7 +314,8 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -271,7 +314,8 @@
.data = NULL,
.maxlen = 0,
.mode = 0444,
@@ -4022,7 +3948,7 @@
},
{
.ctl_name = OBD_PAGESUSED,
-@@ -279,7 +323,8 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -279,7 +323,8 @@
.data = NULL,
.maxlen = 0,
.mode = 0444,
@@ -4032,7 +3958,7 @@
},
{
.ctl_name = OBD_MAXMEMUSED,
-@@ -287,7 +332,8 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -287,7 +332,8 @@
.data = NULL,
.maxlen = 0,
.mode = 0444,
@@ -4042,7 +3968,7 @@
},
{
.ctl_name = OBD_MAXPAGESUSED,
-@@ -295,7 +341,8 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -295,7 +341,8 @@
.data = NULL,
.maxlen = 0,
.mode = 0444,
@@ -4052,7 +3978,7 @@
},
{
.ctl_name = OBD_LDLM_TIMEOUT,
-@@ -319,15 +366,13 @@ static cfs_sysctl_table_t obd_table[] =
+@@ -319,15 +366,13 @@
};
static cfs_sysctl_table_t parent_table[] = {
@@ -4075,10 +4001,10 @@
};
void obd_sysctl_init (void)
-diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
---- a/lustre/obdclass/llog_obd.c
-+++ b/lustre/obdclass/llog_obd.c
-@@ -178,7 +178,7 @@ int llog_add(struct llog_ctxt *ctxt, str
+diff -urNad lustre-1.6.5.1~/lustre/obdclass/llog_obd.c lustre-1.6.5.1/lustre/obdclass/llog_obd.c
+--- lustre-1.6.5.1~/lustre/obdclass/llog_obd.c 2007-12-24 21:15:32.000000000 +0100
++++ lustre-1.6.5.1/lustre/obdclass/llog_obd.c 2008-09-16 15:51:29.000000000 +0200
+@@ -178,7 +178,7 @@
struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
int numcookies)
{
@@ -4087,7 +4013,7 @@
int rc;
ENTRY;
-@@ -188,10 +188,10 @@ int llog_add(struct llog_ctxt *ctxt, str
+@@ -188,10 +188,10 @@
}
CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP);
@@ -4100,10 +4026,10 @@
RETURN(rc);
}
EXPORT_SYMBOL(llog_add);
-diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
---- a/lustre/obdclass/lprocfs_status.c
-+++ b/lustre/obdclass/lprocfs_status.c
-@@ -117,6 +117,8 @@ int lprocfs_add_simple(struct proc_dir_e
+diff -urNad lustre-1.6.5.1~/lustre/obdclass/lprocfs_status.c lustre-1.6.5.1/lustre/obdclass/lprocfs_status.c
+--- lustre-1.6.5.1~/lustre/obdclass/lprocfs_status.c 2008-05-20 04:03:20.000000000 +0200
++++ lustre-1.6.5.1/lustre/obdclass/lprocfs_status.c 2008-09-16 15:51:29.000000000 +0200
+@@ -117,6 +117,8 @@
proc->read_proc = read_proc;
proc->write_proc = write_proc;
proc->data = data;
@@ -4112,7 +4038,7 @@
return 0;
}
-@@ -136,7 +138,7 @@ static ssize_t lprocfs_fops_read(struct
+@@ -136,7 +138,7 @@
LPROCFS_ENTRY();
OBD_FAIL_TIMEOUT(OBD_FAIL_LPROC_REMOVE, 10);
@@ -4121,7 +4047,7 @@
rc = dp->read_proc(page, &start, *ppos, PAGE_SIZE,
&eof, dp->data);
LPROCFS_EXIT();
-@@ -175,7 +177,7 @@ static ssize_t lprocfs_fops_write(struct
+@@ -175,7 +177,7 @@
int rc = -EIO;
LPROCFS_ENTRY();
@@ -4130,10 +4056,10 @@
rc = dp->write_proc(f, buf, size, dp->data);
LPROCFS_EXIT();
return rc;
-diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
---- a/lustre/ptlrpc/service.c
-+++ b/lustre/ptlrpc/service.c
-@@ -1244,7 +1244,7 @@ void ptlrpc_daemonize(char *name)
+diff -urNad lustre-1.6.5.1~/lustre/ptlrpc/service.c lustre-1.6.5.1/lustre/ptlrpc/service.c
+--- lustre-1.6.5.1~/lustre/ptlrpc/service.c 2008-05-13 07:10:50.000000000 +0200
++++ lustre-1.6.5.1/lustre/ptlrpc/service.c 2008-09-16 15:51:29.000000000 +0200
+@@ -1244,7 +1244,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
current->fs = fs;
More information about the Pkg-lustre-svn-commit
mailing list