Author: winnie
Date: Wed Sep 17 12:45:27 2008
New Revision: 501
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=501
Log:
Some smaller changes
Modified:
trunk/debian/changelog
trunk/debian/control.modules.in
trunk/debian/patches/patchless_support_2.6.24.dpatch
Modified: trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=501&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Sep 17 12:45:27 2008
@@ -23,8 +23,10 @@
- added use_bash_instead_of_sh.dpatch to use bash instead of sh
in make-tree
- modified fix-lustre-manpage.dpatch to fix typo in lctl.8
-
- -- Patrick Winnertz <[EMAIL PROTECTED]> Tue, 16 Sep 2008 09:52:09 +0200
+ * Added libsnmp-dev as dependency to control.modules.in as the build fails
+ without it.
+
+ -- Patrick Winnertz <[EMAIL PROTECTED]> Tue, 16 Sep 2008 19:20:35 +0200
lustre (1.6.5.1-1) unstable; urgency=low
Modified: trunk/debian/control.modules.in
URL:
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/control.modules.in?rev=501&op=diff
==============================================================================
--- trunk/debian/control.modules.in (original)
+++ trunk/debian/control.modules.in Wed Sep 17 12:45:27 2008
@@ -4,7 +4,7 @@
Maintainer: Lustre Packaging team <[EMAIL PROTECTED]>
Uploaders: Alastair McKinstry <[EMAIL PROTECTED]>, Goswin von Brederlow
<[EMAIL PROTECTED]>, Patrick Winnertz <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.0), bzip2, dpatch
+Build-Depends: debhelper (>= 5.0.0), libsnmp-dev, bzip2, dpatch
Package: lustre-modules-_KVERS_
Architecture: i386 powerpc amd64 ia64
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=501&op=diff
==============================================================================
--- trunk/debian/patches/patchless_support_2.6.24.dpatch (original)
+++ trunk/debian/patches/patchless_support_2.6.24.dpatch Wed Sep 17 12:45:27
2008
@@ -5,9 +5,9 @@
## DP: Patch which will enable 2.6.24 patchless support for lustre, taken from
#14250
@DPATCH@
-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
+diff -urNad trunk~/lnet/autoconf/lustre-lnet.m4
trunk/lnet/autoconf/lustre-lnet.m4
+--- trunk~/lnet/autoconf/lustre-lnet.m4 2008-06-26 06:43:33.000000000
+0200
++++ trunk/lnet/autoconf/lustre-lnet.m4 2008-09-17 14:37:10.000000000 +0200
@@ -1263,6 +1263,41 @@
])
])
@@ -60,9 +60,9 @@
])
#
-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
+diff -urNad trunk~/lnet/include/libcfs/curproc.h
trunk/lnet/include/libcfs/curproc.h
+--- trunk~/lnet/include/libcfs/curproc.h 2007-02-10 01:04:30.000000000
+0100
++++ trunk/lnet/include/libcfs/curproc.h 2008-09-17 14:37:10.000000000
+0200
@@ -49,6 +49,11 @@
*/
cfs_kernel_cap_t cfs_curproc_cap_get(void);
@@ -75,9 +75,9 @@
#endif
/* __LIBCFS_CURPROC_H__ */
-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
+diff -urNad trunk~/lnet/include/libcfs/linux/linux-prim.h
trunk/lnet/include/libcfs/linux/linux-prim.h
+--- trunk~/lnet/include/libcfs/linux/linux-prim.h 2008-01-14
02:12:18.000000000 +0100
++++ trunk/lnet/include/libcfs/linux/linux-prim.h 2008-09-17
14:37:10.000000000 +0200
@@ -68,6 +68,17 @@
#endif
#define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t)
@@ -96,9 +96,9 @@
/*
* Symbol register
*/
-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
+diff -urNad trunk~/lnet/klnds/gmlnd/gmlnd_module.c
trunk/lnet/klnds/gmlnd/gmlnd_module.c
+--- trunk~/lnet/klnds/gmlnd/gmlnd_module.c 2007-09-27 04:30:24.000000000
+0200
++++ trunk/lnet/klnds/gmlnd/gmlnd_module.c 2008-09-17 14:37:10.000000000
+0200
@@ -62,9 +62,37 @@
};
@@ -201,9 +201,9 @@
.procname = "gmnal",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/iiblnd/iiblnd_modparams.c
trunk/lnet/klnds/iiblnd/iiblnd_modparams.c
+--- trunk~/lnet/klnds/iiblnd/iiblnd_modparams.c 2007-09-10
17:35:53.000000000 +0200
++++ trunk/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-09-17 14:37:10.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) */
@@ -382,9 +382,9 @@
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd.h
trunk/lnet/klnds/o2iblnd/o2iblnd.h
+--- trunk~/lnet/klnds/o2iblnd/o2iblnd.h 2008-03-14 19:18:05.000000000
+0100
++++ trunk/lnet/klnds/o2iblnd/o2iblnd.h 2008-09-17 14:37:10.000000000 +0200
@@ -759,3 +759,13 @@
@@ -399,9 +399,9 @@
+ sg->length = len;
+}
+#endif
-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
+diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_cb.c
trunk/lnet/klnds/o2iblnd/o2iblnd_cb.c
+--- trunk~/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-03-28 08:12:34.000000000
+0100
++++ trunk/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-09-17 14:37:10.000000000
+0200
@@ -626,9 +626,7 @@
fragnob = min((int)(iov->iov_len - offset), nob);
fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -428,9 +428,9 @@
offset = 0;
kiov++;
nkiov--;
-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
+diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_modparams.c
trunk/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+--- trunk~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2007-09-10
17:35:53.000000000 +0200
++++ trunk/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-09-17
14:37:10.000000000 +0200
@@ -113,9 +113,51 @@
static char ipif_basename_space[32];
@@ -619,9 +619,9 @@
.procname = "o2iblnd",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/openiblnd/openiblnd_modparams.c
trunk/lnet/klnds/openiblnd/openiblnd_modparams.c
+--- trunk~/lnet/klnds/openiblnd/openiblnd_modparams.c 2007-09-10
17:35:54.000000000 +0200
++++ trunk/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-09-17
14:37:10.000000000 +0200
@@ -83,9 +83,42 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -765,9 +765,9 @@
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/ptllnd/ptllnd_modparams.c
trunk/lnet/klnds/ptllnd/ptllnd_modparams.c
+--- trunk~/lnet/klnds/ptllnd/ptllnd_modparams.c 2007-09-27
04:30:24.000000000 +0200
++++ trunk/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-09-17 14:37:10.000000000
+0200
@@ -134,9 +134,54 @@
}
#endif
@@ -978,9 +978,9 @@
.procname = "ptllnd",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/qswlnd/qswlnd_modparams.c
trunk/lnet/klnds/qswlnd/qswlnd_modparams.c
+--- trunk~/lnet/klnds/qswlnd/qswlnd_modparams.c 2007-09-10
17:35:55.000000000 +0200
++++ trunk/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-09-17 14:37:10.000000000
+0200
@@ -1,4 +1,7 @@
/*
+ * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
@@ -1135,9 +1135,9 @@
.procname = "qswnal",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/ralnd/ralnd_modparams.c
trunk/lnet/klnds/ralnd/ralnd_modparams.c
+--- trunk~/lnet/klnds/ralnd/ralnd_modparams.c 2007-08-02 10:30:12.000000000
+0200
++++ trunk/lnet/klnds/ralnd/ralnd_modparams.c 2008-09-17 14:37:10.000000000
+0200
@@ -72,9 +72,37 @@
};
@@ -1258,9 +1258,9 @@
.procname = "ranal",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/klnds/socklnd/socklnd_lib-linux.c
trunk/lnet/klnds/socklnd/socklnd_lib-linux.c
+--- trunk~/lnet/klnds/socklnd/socklnd_lib-linux.c 2007-09-11
21:39:20.000000000 +0200
++++ trunk/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-09-17
14:37:10.000000000 +0200
@@ -5,197 +5,244 @@
#include "socklnd.h"
@@ -1585,9 +1585,9 @@
ksocknal_tunables.ksnd_sysctl =
cfs_register_sysctl_table(ksocknal_top_ctl_table, 0);
-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
+diff -urNad trunk~/lnet/klnds/viblnd/viblnd_modparams.c
trunk/lnet/klnds/viblnd/viblnd_modparams.c
+--- trunk~/lnet/klnds/viblnd/viblnd_modparams.c 2007-09-27
04:30:24.000000000 +0200
++++ trunk/lnet/klnds/viblnd/viblnd_modparams.c 2008-09-17 14:37:10.000000000
+0200
@@ -125,6 +125,56 @@
#endif
};
@@ -1825,9 +1825,9 @@
.procname = "vibnal",
.data = NULL,
.maxlen = 0,
-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
+diff -urNad trunk~/lnet/libcfs/linux/linux-curproc.c
trunk/lnet/libcfs/linux/linux-curproc.c
+--- trunk~/lnet/libcfs/linux/linux-curproc.c 2007-02-10 01:04:59.000000000
+0100
++++ trunk/lnet/libcfs/linux/linux-curproc.c 2008-09-17 14:37:10.000000000
+0200
@@ -109,6 +109,19 @@
current->cap_effective = cap;
}
@@ -1857,9 +1857,9 @@
/*
* Local variables:
* c-indentation-style: "K&R"
-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
+diff -urNad trunk~/lnet/libcfs/linux/linux-proc.c
trunk/lnet/libcfs/linux/linux-proc.c
+--- trunk~/lnet/libcfs/linux/linux-proc.c 2008-03-25 13:23:25.000000000
+0100
++++ trunk/lnet/libcfs/linux/linux-proc.c 2008-09-17 14:43:12.000000000
+0200
@@ -61,7 +61,8 @@
static cfs_sysctl_table_header_t *lnet_table_header = NULL;
extern char lnet_upcall[1024];
@@ -2042,7 +2042,7 @@
},
{
.ctl_name = PSDEV_LNET_PANIC_ON_LBUG,
-@@ -388,39 +411,50 @@
+@@ -388,39 +411,52 @@
.data = &libcfs_panic_on_lbug,
.maxlen = sizeof(int),
.mode = 0644,
@@ -2091,7 +2091,9 @@
.mode = 0555,
- .child = lnet_table
+ .child = lnet_table,
++#ifdef HAVE_PARENT_IN_CTLTABLE
+ .parent = NULL,
++#endif
},
- {0}
+ {
@@ -2100,9 +2102,9 @@
};
int insert_proc(void)
-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
+diff -urNad trunk~/lnet/lnet/router_proc.c trunk/lnet/lnet/router_proc.c
+--- trunk~/lnet/lnet/router_proc.c 2007-11-29 14:35:39.000000000 +0100
++++ trunk/lnet/lnet/router_proc.c 2008-09-17 14:37:10.000000000 +0200
@@ -32,12 +32,13 @@
/* this is really lnet_proc.c */
@@ -2144,10 +2146,41 @@
}
#else
-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 @@
+diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-core.m4
+--- trunk~/lustre/autoconf/lustre-core.m4 2008-06-26 05:05:21.000000000
+0200
++++ trunk/lustre/autoconf/lustre-core.m4 2008-09-17 14:41:19.000000000
+0200
+@@ -1064,18 +1064,61 @@
+ ])
+ ])
+
++# Older kernels (2.6.18) doesn't know about .parent in
++# ctl_table
++AC_DEFUN([CLT_TABLE_HAS_PARENT],
++[AC_MSG_CHECKING([sysctl has .parent])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/module.h>
++ #include <linux/sysctl.h>
++],[
++ struct ctl_table random_table[] = {
++ {
++ .ctl_name = 1,
++ .procname = "poolsize",
++ .data = NULL,
++ .maxlen = sizeof(int),
++ .parent = NULL,
++ },
++ { .ctl_name = 0 }
++ };
++],[
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_PARENT_IN_CTLTABLE, 1,
++ [ctl_table knows .parent])
++],[
++ AC_MSG_RESULT(NO)
++])
++])
++
+ # RHEL5 PageChecked and SetPageChecked defined
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
LB_LINUX_TRY_COMPILE([
@@ -2185,7 +2218,7 @@
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PAGE_CHECKED, 1,
-@@ -1230,11 +1246,155 @@
+@@ -1230,11 +1273,155 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -2346,7 +2379,7 @@
])
#
-@@ -1327,10 +1487,23 @@
+@@ -1327,10 +1514,23 @@
# 2.6.22
LC_INVALIDATE_BDEV_2ARG
@@ -2370,7 +2403,7 @@
])
#
-@@ -1511,6 +1684,7 @@
+@@ -1511,6 +1711,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -2378,9 +2411,9 @@
],[
AC_MSG_RESULT([no])
])
-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
+diff -urNad trunk~/lustre/include/liblustre.h trunk/lustre/include/liblustre.h
+--- trunk~/lustre/include/liblustre.h 2008-04-24 09:07:44.000000000 +0200
++++ trunk/lustre/include/liblustre.h 2008-09-17 14:37:10.000000000 +0200
@@ -718,11 +718,13 @@
struct _cap_struct;
typedef struct _cap_struct *cap_t;
@@ -2430,9 +2463,9 @@
static inline void libcfs_run_lbug_upcall(char *file, const char *fn,
const int l){}
-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
+diff -urNad trunk~/lustre/include/linux/lustre_compat25.h
trunk/lustre/include/linux/lustre_compat25.h
+--- trunk~/lustre/include/linux/lustre_compat25.h 2008-03-27
04:32:33.000000000 +0100
++++ trunk/lustre/include/linux/lustre_compat25.h 2008-09-17
14:37:10.000000000 +0200
@@ -43,6 +43,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
@@ -2527,9 +2560,9 @@
+
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
-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
+diff -urNad trunk~/lustre/include/linux/lvfs.h
trunk/lustre/include/linux/lvfs.h
+--- trunk~/lustre/include/linux/lvfs.h 2007-07-26 08:24:10.000000000 +0200
++++ trunk/lustre/include/linux/lvfs.h 2008-09-17 14:37:10.000000000 +0200
@@ -47,7 +47,7 @@
struct upcall_cache_entry *luc_uce;
__u32 luc_fsuid;
@@ -2539,9 +2572,9 @@
__u32 luc_suppgid1;
__u32 luc_suppgid2;
__u32 luc_umask;
-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
+diff -urNad trunk~/lustre/include/lprocfs_status.h
trunk/lustre/include/lprocfs_status.h
+--- trunk~/lustre/include/lprocfs_status.h 2008-04-18 06:47:52.000000000
+0200
++++ trunk/lustre/include/lprocfs_status.h 2008-09-17 14:37:10.000000000
+0200
@@ -481,6 +481,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -2565,9 +2598,9 @@
/* You must use these macros when you want to refer to
* the import in a client obd_device for a lprocfs entry */
-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
+diff -urNad trunk~/lustre/include/lustre_log.h
trunk/lustre/include/lustre_log.h
+--- trunk~/lustre/include/lustre_log.h 2007-08-24 13:12:48.000000000 +0200
++++ trunk/lustre/include/lustre_log.h 2008-09-17 14:37:10.000000000 +0200
@@ -218,14 +218,6 @@
void *llog_proc_cb;
};
@@ -2628,9 +2661,9 @@
RETURN(rc);
}
-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
+diff -urNad trunk~/lustre/include/lustre_mds.h
trunk/lustre/include/lustre_mds.h
+--- trunk~/lustre/include/lustre_mds.h 2008-04-24 06:41:00.000000000 +0200
++++ trunk/lustre/include/lustre_mds.h 2008-09-17 14:37:10.000000000 +0200
@@ -177,7 +177,7 @@
struct page *, struct ptlrpc_request **);
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -2640,9 +2673,9 @@
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 -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
+diff -urNad trunk~/lustre/llite/file.c trunk/lustre/llite/file.c
+--- trunk~/lustre/llite/file.c 2008-09-17 14:37:09.000000000 +0200
++++ trunk/lustre/llite/file.c 2008-09-17 14:37:10.000000000 +0200
@@ -1681,9 +1681,17 @@
/*
* Send file content (through pagecache) somewhere with helper
@@ -2774,9 +2807,9 @@
.sendfile = ll_file_sendfile,
#endif
.fsync = ll_fsync,
-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
+diff -urNad trunk~/lustre/llite/llite_internal.h
trunk/lustre/llite/llite_internal.h
+--- trunk~/lustre/llite/llite_internal.h 2008-04-26 16:30:54.000000000
+0200
++++ trunk/lustre/llite/llite_internal.h 2008-09-17 14:37:10.000000000
+0200
@@ -681,9 +681,6 @@
/* llite/llite_nfs.c */
extern struct export_operations lustre_export_operations;
@@ -2787,9 +2820,9 @@
/* llite/special.c */
extern struct inode_operations ll_special_inode_operations;
-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
+diff -urNad trunk~/lustre/llite/llite_lib.c trunk/lustre/llite/llite_lib.c
+--- trunk~/lustre/llite/llite_lib.c 2008-05-28 21:15:40.000000000 +0200
++++ trunk/lustre/llite/llite_lib.c 2008-09-17 14:37:10.000000000 +0200
@@ -1347,7 +1347,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -2799,9 +2832,9 @@
ll_inode_size_unlock(inode, 0);
}
}
-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
+diff -urNad trunk~/lustre/llite/llite_mmap.c trunk/lustre/llite/llite_mmap.c
+--- trunk~/lustre/llite/llite_mmap.c 2008-03-27 04:32:37.000000000 +0100
++++ trunk/lustre/llite/llite_mmap.c 2008-09-17 14:37:10.000000000 +0200
@@ -38,9 +38,6 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -3141,9 +3174,9 @@
if (!filemap_populate)
filemap_populate = vma->vm_ops->populate;
#endif
-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
+diff -urNad trunk~/lustre/llite/llite_nfs.c trunk/lustre/llite/llite_nfs.c
+--- trunk~/lustre/llite/llite_nfs.c 2008-04-24 06:41:05.000000000 +0200
++++ trunk/lustre/llite/llite_nfs.c 2008-09-17 14:37:10.000000000 +0200
@@ -40,11 +40,7 @@
return (key0 << 1);
}
@@ -3418,9 +3451,9 @@
#endif
+ .get_parent = ll_get_parent,
+};
-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
+diff -urNad trunk~/lustre/llite/lloop.c trunk/lustre/llite/lloop.c
+--- trunk~/lustre/llite/lloop.c 2007-11-21 13:11:10.000000000 +0100
++++ trunk/lustre/llite/lloop.c 2008-09-17 14:37:10.000000000 +0200
@@ -299,7 +299,7 @@
if (atomic_dec_and_test(&lo->lo_pending))
up(&lo->lo_bh_mutex);
@@ -3439,9 +3472,9 @@
}
/*
-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
+diff -urNad trunk~/lustre/llite/namei.c trunk/lustre/llite/namei.c
+--- trunk~/lustre/llite/namei.c 2008-04-24 06:41:06.000000000 +0200
++++ trunk/lustre/llite/namei.c 2008-09-17 14:37:10.000000000 +0200
@@ -879,7 +879,7 @@
err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len,
@@ -3451,9 +3484,9 @@
if (err)
GOTO(err_exit, err);
-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
+diff -urNad trunk~/lustre/llite/rw.c trunk/lustre/llite/rw.c
+--- trunk~/lustre/llite/rw.c 2008-04-03 05:23:43.000000000 +0200
++++ trunk/lustre/llite/rw.c 2008-09-17 14:37:10.000000000 +0200
@@ -161,7 +161,7 @@
GOTO(out_unlock, 0);
}
@@ -3463,9 +3496,9 @@
if (!srvlock) {
struct ost_lvb lvb;
-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
+diff -urNad trunk~/lustre/llite/symlink.c trunk/lustre/llite/symlink.c
+--- trunk~/lustre/llite/symlink.c 2007-10-25 04:14:35.000000000 +0200
++++ trunk/lustre/llite/symlink.c 2008-09-17 14:37:10.000000000 +0200
@@ -156,8 +156,12 @@
rc = ll_readlink_internal(inode, &request, &symname);
up(&lli->lli_size_sem);
@@ -3479,9 +3512,9 @@
GOTO(out, rc);
}
-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
+diff -urNad trunk~/lustre/lvfs/lvfs_linux.c trunk/lustre/lvfs/lvfs_linux.c
+--- trunk~/lustre/lvfs/lvfs_linux.c 2007-10-30 06:25:57.000000000 +0100
++++ trunk/lustre/lvfs/lvfs_linux.c 2008-09-17 14:37:10.000000000 +0200
@@ -133,10 +133,10 @@
*/
@@ -3534,9 +3567,9 @@
pop_group_info(saved, uc->luc_uce);
}
-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
+diff -urNad trunk~/lustre/mdc/mdc_internal.h trunk/lustre/mdc/mdc_internal.h
+--- trunk~/lustre/mdc/mdc_internal.h 2008-01-17 14:00:30.000000000 +0100
++++ trunk/lustre/mdc/mdc_internal.h 2008-09-17 14:37:10.000000000 +0200
@@ -28,7 +28,7 @@
void *ea2, int ea2len);
void mdc_create_pack(struct ptlrpc_request *req, int offset,
@@ -3546,9 +3579,9 @@
__u64 rdev);
void mdc_open_pack(struct ptlrpc_request *req, int offset,
struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
-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
+diff -urNad trunk~/lustre/mdc/mdc_lib.c trunk/lustre/mdc/mdc_lib.c
+--- trunk~/lustre/mdc/mdc_lib.c 2008-03-26 07:22:04.000000000 +0100
++++ trunk/lustre/mdc/mdc_lib.c 2008-09-17 14:37:10.000000000 +0200
@@ -46,7 +46,7 @@
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
b->fsuid = current->fsuid;
@@ -3639,9 +3672,9 @@
b->valid = valid;
b->flags = flags | MDS_BFLAG_EXT_FLAGS;
/* skip MDS_BFLAG_EXT_FLAGS to verify the "client < 1.4.7" case
-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
+diff -urNad trunk~/lustre/mdc/mdc_reint.c trunk/lustre/mdc/mdc_reint.c
+--- trunk~/lustre/mdc/mdc_reint.c 2008-02-18 13:43:18.000000000 +0100
++++ trunk/lustre/mdc/mdc_reint.c 2008-09-17 14:37:10.000000000 +0200
@@ -164,7 +164,7 @@
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -3651,9 +3684,9 @@
{
CFS_LIST_HEAD(cancels);
struct obd_device *obd = exp->exp_obd;
-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
+diff -urNad trunk~/lustre/mgc/mgc_request.c trunk/lustre/mgc/mgc_request.c
+--- trunk~/lustre/mgc/mgc_request.c 2008-04-24 13:54:15.000000000 +0200
++++ trunk/lustre/mgc/mgc_request.c 2008-09-17 14:37:10.000000000 +0200
@@ -395,7 +395,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3663,9 +3696,9 @@
strlen(MOUNT_CONFIGS_DIR));
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (IS_ERR(dentry)) {
-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
+diff -urNad trunk~/lustre/obdclass/linux/linux-module.c
trunk/lustre/obdclass/linux/linux-module.c
+--- trunk~/lustre/obdclass/linux/linux-module.c 2007-11-13
21:43:24.000000000 +0100
++++ trunk/lustre/obdclass/linux/linux-module.c 2008-09-17 14:37:10.000000000
+0200
@@ -386,7 +386,7 @@
ENTRY;
@@ -3675,9 +3708,9 @@
if (!proc_lustre_root) {
printk(KERN_ERR
"LustreError: error registering /proc/fs/lustre\n");
-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
+diff -urNad trunk~/lustre/obdclass/linux/linux-sysctl.c
trunk/lustre/obdclass/linux/linux-sysctl.c
+--- trunk~/lustre/obdclass/linux/linux-sysctl.c 2008-03-25
13:25:41.000000000 +0100
++++ trunk/lustre/obdclass/linux/linux-sysctl.c 2008-09-17 14:37:10.000000000
+0200
@@ -48,7 +48,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -4001,9 +4034,9 @@
};
void obd_sysctl_init (void)
-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
+diff -urNad trunk~/lustre/obdclass/llog_obd.c trunk/lustre/obdclass/llog_obd.c
+--- trunk~/lustre/obdclass/llog_obd.c 2007-12-24 21:15:32.000000000 +0100
++++ trunk/lustre/obdclass/llog_obd.c 2008-09-17 14:37:10.000000000 +0200
@@ -178,7 +178,7 @@
struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
int numcookies)
@@ -4026,9 +4059,9 @@
RETURN(rc);
}
EXPORT_SYMBOL(llog_add);
-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
+diff -urNad trunk~/lustre/obdclass/lprocfs_status.c
trunk/lustre/obdclass/lprocfs_status.c
+--- trunk~/lustre/obdclass/lprocfs_status.c 2008-05-20 04:03:20.000000000
+0200
++++ trunk/lustre/obdclass/lprocfs_status.c 2008-09-17 14:37:10.000000000
+0200
@@ -117,6 +117,8 @@
proc->read_proc = read_proc;
proc->write_proc = write_proc;
@@ -4056,9 +4089,9 @@
rc = dp->write_proc(f, buf, size, dp->data);
LPROCFS_EXIT();
return rc;
-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
+diff -urNad trunk~/lustre/ptlrpc/service.c trunk/lustre/ptlrpc/service.c
+--- trunk~/lustre/ptlrpc/service.c 2008-05-13 07:10:50.000000000 +0200
++++ trunk/lustre/ptlrpc/service.c 2008-09-17 14:37:10.000000000 +0200
@@ -1244,7 +1244,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit
