The following commit has been merged in the master branch:
commit 69e04ddc08207c97a0000fdb15bb6086fd5646b1
Author: Patrick Winnertz <[EMAIL PROTECTED]>
Date: Fri Oct 10 15:49:30 2008 +0200
Fix some smaller issues with patchless support for 2.6.27
WARNING: this errors are still there:
passing argument 1 of ‘_write_lock_irq’ from incompatible pointer type
passing argument 1 of ‘__raw_write_unlock’ from incompatible pointer type
diff --git a/debian/patches/patchless_support_2.6.27.dpatch
b/debian/patches/patchless_support_2.6.27.dpatch
index 76688e3..f929390 100755
--- a/debian/patches/patchless_support_2.6.27.dpatch
+++ b/debian/patches/patchless_support_2.6.27.dpatch
@@ -6,9 +6,9 @@
## DP: lustre, taken from #14250 and slightly modified for debian
@DPATCH@
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4
lustre/lnet/autoconf/lustre-lnet.m4
+--- lustre~/lnet/autoconf/lustre-lnet.m4 2008-06-26 06:43:33.000000000
+0200
++++ lustre/lnet/autoconf/lustre-lnet.m4 2008-10-10 14:58:52.000000000
+0200
@@ -1263,6 +1263,55 @@
])
])
@@ -49,7 +49,7 @@ diff -urNad trunk~/lnet/autoconf/lustre-lnet.m4
trunk/lnet/autoconf/lustre-lnet.
+
+AC_DEFUN([LN_SOCKMAP_FD_EXTRA_FLAG],
+[AC_MSG_CHECKING([if sock_map_fd accepts flags])
-+LB_LINUX_TRY_COMPILLE([
++LB_LINUX_TRY_COMPILE([
+ #include <linux/net.h>
+],[
+ sock_map_fd(NULL,0);
@@ -77,9 +77,9 @@ diff -urNad trunk~/lnet/autoconf/lustre-lnet.m4
trunk/lnet/autoconf/lustre-lnet.
])
#
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/include/libcfs/curproc.h
lustre/lnet/include/libcfs/curproc.h
+--- lustre~/lnet/include/libcfs/curproc.h 2007-02-10 01:04:30.000000000
+0100
++++ lustre/lnet/include/libcfs/curproc.h 2008-10-10 14:58:53.000000000
+0200
@@ -49,6 +49,11 @@
*/
cfs_kernel_cap_t cfs_curproc_cap_get(void);
@@ -92,9 +92,9 @@ diff -urNad trunk~/lnet/include/libcfs/curproc.h
trunk/lnet/include/libcfs/curpr
#endif
/* __LIBCFS_CURPROC_H__ */
-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-18
23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/include/libcfs/linux/linux-prim.h
lustre/lnet/include/libcfs/linux/linux-prim.h
+--- lustre~/lnet/include/libcfs/linux/linux-prim.h 2008-01-14
02:12:18.000000000 +0100
++++ lustre/lnet/include/libcfs/linux/linux-prim.h 2008-10-10
14:58:53.000000000 +0200
@@ -68,6 +68,17 @@
#endif
#define cfs_unregister_sysctl_table(t) unregister_sysctl_table(t)
@@ -113,9 +113,9 @@ diff -urNad trunk~/lnet/include/libcfs/linux/linux-prim.h
trunk/lnet/include/lib
/*
* Symbol register
*/
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/gmlnd/gmlnd_module.c
lustre/lnet/klnds/gmlnd/gmlnd_module.c
+--- lustre~/lnet/klnds/gmlnd/gmlnd_module.c 2007-09-27 04:30:24.000000000
+0200
++++ lustre/lnet/klnds/gmlnd/gmlnd_module.c 2008-10-10 14:58:53.000000000
+0200
@@ -62,9 +62,37 @@
};
@@ -218,9 +218,9 @@ diff -urNad trunk~/lnet/klnds/gmlnd/gmlnd_module.c
trunk/lnet/klnds/gmlnd/gmlnd_
.procname = "gmnal",
.data = NULL,
.maxlen = 0,
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c
lustre/lnet/klnds/iiblnd/iiblnd_modparams.c
+--- lustre~/lnet/klnds/iiblnd/iiblnd_modparams.c 2007-09-10
17:35:53.000000000 +0200
++++ lustre/lnet/klnds/iiblnd/iiblnd_modparams.c 2008-10-10
14:58:53.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) */
@@ -399,9 +399,9 @@ diff -urNad trunk~/lnet/klnds/iiblnd/iiblnd_modparams.c
trunk/lnet/klnds/iiblnd/
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd.h
lustre/lnet/klnds/o2iblnd/o2iblnd.h
+--- lustre~/lnet/klnds/o2iblnd/o2iblnd.h 2008-03-14 19:18:05.000000000
+0100
++++ lustre/lnet/klnds/o2iblnd/o2iblnd.h 2008-10-10 14:58:53.000000000
+0200
@@ -759,3 +759,13 @@
@@ -416,9 +416,9 @@ diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd.h
trunk/lnet/klnds/o2iblnd/o2iblnd
+ sg->length = len;
+}
+#endif
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c
lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+--- lustre~/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-03-28 08:12:34.000000000
+0100
++++ lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 2008-10-10 14:58:53.000000000
+0200
@@ -626,9 +626,7 @@
fragnob = min((int)(iov->iov_len - offset), nob);
fragnob = min(fragnob, (int)PAGE_SIZE - page_offset);
@@ -445,9 +445,9 @@ diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_cb.c
trunk/lnet/klnds/o2iblnd/o2ib
offset = 0;
kiov++;
nkiov--;
-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-18
23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c
lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+--- lustre~/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2007-09-10
17:35:53.000000000 +0200
++++ lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c 2008-10-10
14:58:53.000000000 +0200
@@ -113,9 +113,51 @@
static char ipif_basename_space[32];
@@ -636,9 +636,9 @@ diff -urNad trunk~/lnet/klnds/o2iblnd/o2iblnd_modparams.c
trunk/lnet/klnds/o2ibl
.procname = "o2iblnd",
.data = NULL,
.maxlen = 0,
-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-18
23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c
lustre/lnet/klnds/openiblnd/openiblnd_modparams.c
+--- lustre~/lnet/klnds/openiblnd/openiblnd_modparams.c 2007-09-10
17:35:54.000000000 +0200
++++ lustre/lnet/klnds/openiblnd/openiblnd_modparams.c 2008-10-10
14:58:53.000000000 +0200
@@ -83,9 +83,42 @@
#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
@@ -782,9 +782,9 @@ diff -urNad
trunk~/lnet/klnds/openiblnd/openiblnd_modparams.c trunk/lnet/klnds/o
.procname = "openibnal",
.data = NULL,
.maxlen = 0,
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c
lustre/lnet/klnds/ptllnd/ptllnd_modparams.c
+--- lustre~/lnet/klnds/ptllnd/ptllnd_modparams.c 2007-09-27
04:30:24.000000000 +0200
++++ lustre/lnet/klnds/ptllnd/ptllnd_modparams.c 2008-10-10
14:58:53.000000000 +0200
@@ -134,9 +134,54 @@
}
#endif
@@ -995,9 +995,9 @@ diff -urNad trunk~/lnet/klnds/ptllnd/ptllnd_modparams.c
trunk/lnet/klnds/ptllnd/
.procname = "ptllnd",
.data = NULL,
.maxlen = 0,
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c
lustre/lnet/klnds/qswlnd/qswlnd_modparams.c
+--- lustre~/lnet/klnds/qswlnd/qswlnd_modparams.c 2007-09-10
17:35:55.000000000 +0200
++++ lustre/lnet/klnds/qswlnd/qswlnd_modparams.c 2008-10-10
14:58:53.000000000 +0200
@@ -1,4 +1,7 @@
/*
+ * -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
@@ -1152,9 +1152,9 @@ diff -urNad trunk~/lnet/klnds/qswlnd/qswlnd_modparams.c
trunk/lnet/klnds/qswlnd/
.procname = "qswnal",
.data = NULL,
.maxlen = 0,
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/ralnd/ralnd_modparams.c
lustre/lnet/klnds/ralnd/ralnd_modparams.c
+--- lustre~/lnet/klnds/ralnd/ralnd_modparams.c 2007-08-02 10:30:12.000000000
+0200
++++ lustre/lnet/klnds/ralnd/ralnd_modparams.c 2008-10-10 14:58:53.000000000
+0200
@@ -72,9 +72,37 @@
};
@@ -1275,9 +1275,9 @@ diff -urNad trunk~/lnet/klnds/ralnd/ralnd_modparams.c
trunk/lnet/klnds/ralnd/ral
.procname = "ranal",
.data = NULL,
.maxlen = 0,
-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-18
23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c
lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
+--- lustre~/lnet/klnds/socklnd/socklnd_lib-linux.c 2007-09-11
21:39:20.000000000 +0200
++++ lustre/lnet/klnds/socklnd/socklnd_lib-linux.c 2008-10-10
14:58:53.000000000 +0200
@@ -5,197 +5,244 @@
#include "socklnd.h"
@@ -1602,9 +1602,9 @@ diff -urNad trunk~/lnet/klnds/socklnd/socklnd_lib-linux.c
trunk/lnet/klnds/sockl
ksocknal_tunables.ksnd_sysctl =
cfs_register_sysctl_table(ksocknal_top_ctl_table, 0);
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/klnds/viblnd/viblnd_modparams.c
lustre/lnet/klnds/viblnd/viblnd_modparams.c
+--- lustre~/lnet/klnds/viblnd/viblnd_modparams.c 2007-09-27
04:30:24.000000000 +0200
++++ lustre/lnet/klnds/viblnd/viblnd_modparams.c 2008-10-10
14:58:53.000000000 +0200
@@ -125,6 +125,56 @@
#endif
};
@@ -1842,9 +1842,9 @@ diff -urNad trunk~/lnet/klnds/viblnd/viblnd_modparams.c
trunk/lnet/klnds/viblnd/
.procname = "vibnal",
.data = NULL,
.maxlen = 0,
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c
lustre/lnet/libcfs/linux/linux-curproc.c
+--- lustre~/lnet/libcfs/linux/linux-curproc.c 2007-02-10 01:04:59.000000000
+0100
++++ lustre/lnet/libcfs/linux/linux-curproc.c 2008-10-10 14:58:53.000000000
+0200
@@ -109,6 +109,19 @@
current->cap_effective = cap;
}
@@ -1874,9 +1874,9 @@ diff -urNad trunk~/lnet/libcfs/linux/linux-curproc.c
trunk/lnet/libcfs/linux/lin
/*
* Local variables:
* c-indentation-style: "K&R"
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/libcfs/linux/linux-proc.c
lustre/lnet/libcfs/linux/linux-proc.c
+--- lustre~/lnet/libcfs/linux/linux-proc.c 2008-03-25 13:23:25.000000000
+0100
++++ lustre/lnet/libcfs/linux/linux-proc.c 2008-10-10 14:58:53.000000000
+0200
@@ -61,7 +61,8 @@
static cfs_sysctl_table_header_t *lnet_table_header = NULL;
extern char lnet_upcall[1024];
@@ -2119,9 +2119,9 @@ diff -urNad trunk~/lnet/libcfs/linux/linux-proc.c
trunk/lnet/libcfs/linux/linux-
};
int insert_proc(void)
-diff -urNad trunk~/lnet/libcfs/linux/linux-tcpip.c
trunk/lnet/libcfs/linux/linux-tcpip.c
---- trunk~/lnet/libcfs/linux/linux-tcpip.c 2007-09-06 07:23:17.000000000
+0200
-+++ trunk/lnet/libcfs/linux/linux-tcpip.c 2008-09-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c
lustre/lnet/libcfs/linux/linux-tcpip.c
+--- lustre~/lnet/libcfs/linux/linux-tcpip.c 2007-09-06 07:23:17.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-tcpip.c 2008-10-10 14:58:53.000000000
+0200
@@ -47,8 +47,11 @@
CERROR ("Can't create socket: %d\n", rc);
return rc;
@@ -2135,9 +2135,9 @@ diff -urNad trunk~/lnet/libcfs/linux/linux-tcpip.c
trunk/lnet/libcfs/linux/linux
if (fd < 0) {
rc = fd;
sock_release(sock);
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lnet/lnet/router_proc.c lustre/lnet/lnet/router_proc.c
+--- lustre~/lnet/lnet/router_proc.c 2007-11-29 14:35:39.000000000 +0100
++++ lustre/lnet/lnet/router_proc.c 2008-10-10 14:58:53.000000000 +0200
@@ -32,12 +32,13 @@
/* this is really lnet_proc.c */
@@ -2179,9 +2179,9 @@ diff -urNad trunk~/lnet/lnet/router_proc.c
trunk/lnet/lnet/router_proc.c
}
#else
-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-18 23:52:50.000000000
+0200
+diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre-core.m4
+--- lustre~/lustre/autoconf/lustre-core.m4 2008-06-26 05:05:21.000000000
+0200
++++ lustre/lustre/autoconf/lustre-core.m4 2008-10-10 15:19:32.000000000
+0200
@@ -1064,27 +1064,90 @@
])
])
@@ -2236,13 +2236,13 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
+ #include <linux/page-flags.h>
+ #include <linux/autoconf.h>
+ #include <linux/mm_types.h>
-+],[
+ ],[
+ struct page *p;
+
+ /* 2.6.26 use function instead of define for it */
+ SetPageChecked(p);
+ PageChecked(p);
- ],[
++],[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_PAGE_CHECKED, 1,
+ [does kernel have PageChecked and SetPageChecked])
@@ -2276,7 +2276,7 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE],
[LB_CHECK_SYMBOL_EXPORT([truncate_complete_page],
[mm/truncate.c],[
-@@ -1230,13 +1293,191 @@
+@@ -1230,11 +1293,219 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -2435,8 +2435,8 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
+],[
+ AC_MSG_RESULT([no])
+])
- ])
-
++])
++
+# asm/semaphore.h is deprecated on 2.6.27
+# include instead linux/semaphore.h
+AC_DEFUN([LC_ASM_SEMAPHORE_H],
@@ -2447,9 +2447,9 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
+ //do nothing here
+],[
+ AC_DEFINE(HAVE_ASM_SEMAPHORE_H, 1, [asm/semaphore.h exists])
-+ AC_MSG_RESULT(yes)
++ AC_MSG_RESULT([yes])
+],[
-+ AC_MSG_RESULT(NO)
++ AC_MSG_RESULT([NO])
+])
+])
+
@@ -2462,18 +2462,46 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
+],[
+ request_queue_t *test;
+],[
-+ AC_DEFINE([HAVE_REQUEST_QUEUE_T, 1, [request_queue_t is available])
-+ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_REQUEST_QUEUE_T, 1, [request_queue_t is available])
++ AC_MSG_RESULT([yes])
+],[
-+ AC_MSG_RESULT(NO)
++ AC_MSG_RESULT([NO])
+])
+])
+
++# TestSetPageLocked is replaced by !trylock_page
++# in 2.6.27
++AC_DEFUN([LC_HAVE_TESTSETPAGELOCKED],
++[AC_MSG_CHECKING([if TestSetPageLocked is available])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/page-flags.h>
++],[
++ TestSetPageLocked(NULL);
++],[
++ AC_DEFINE(HAVE_TESTSETPAGELOCKED, 1, [TestSetPageLocked is available])
++ AC_MSG_RESULT([yes])
++],[
++ AC_MSG_RESULT([NO])
++])
++])
+
++# remove_suid is replaces in 2.6.27 with file_removed_suid
++AC_DEFUN([LC_HAVE_REMOVE_SUID],
++[AC_MSG_CHECKING([if remove_suid is available])
++LB_LINUX_TRY_COMPILE([
++ #include <linux/fs.h>
++],[
++ remove_suid(NULL);
++],[
++ AC_DEFINE(HAVE_REMOVE_SUID, 1, [remove_suid is still available])
++ AC_MSG_RESULT([yes])
++],[
++ AC_MSG_RESULT([NO])
++])
+ ])
+
#
- # LC_PROG_LINUX
- #
-@@ -1327,10 +1568,28 @@
+@@ -1327,10 +1598,30 @@
# 2.6.22
LC_INVALIDATE_BDEV_2ARG
@@ -2499,10 +2527,12 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
+ #2.6.27
+ LC_ASM_SEMAPHORE_H
+ LC_REQUEST_QUEUE_T
++ LC_HAVE_TESTSETPAGELOCKED
++ LC_HAVE_REMOVE_SUID
])
#
-@@ -1511,6 +1770,7 @@
+@@ -1511,6 +1802,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -2510,9 +2540,9 @@ diff -urNad trunk~/lustre/autoconf/lustre-core.m4
trunk/lustre/autoconf/lustre-c
],[
AC_MSG_RESULT([no])
])
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/include/liblustre.h
lustre/lustre/include/liblustre.h
+--- lustre~/lustre/include/liblustre.h 2008-04-24 09:07:44.000000000 +0200
++++ lustre/lustre/include/liblustre.h 2008-10-10 14:58:53.000000000 +0200
@@ -718,11 +718,13 @@
struct _cap_struct;
typedef struct _cap_struct *cap_t;
@@ -2562,9 +2592,9 @@ diff -urNad trunk~/lustre/include/liblustre.h
trunk/lustre/include/liblustre.h
static inline void libcfs_run_lbug_upcall(char *file, const char *fn,
const int l){}
-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-18
23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/include/linux/lustre_compat25.h
lustre/lustre/include/linux/lustre_compat25.h
+--- lustre~/lustre/include/linux/lustre_compat25.h 2008-03-27
04:32:33.000000000 +0100
++++ lustre/lustre/include/linux/lustre_compat25.h 2008-10-10
15:21:17.000000000 +0200
@@ -43,6 +43,28 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) */
@@ -2602,7 +2632,19 @@ diff -urNad
trunk~/lustre/include/linux/lustre_compat25.h trunk/lustre/include/l
#else
#define ll_set_fs_pwd set_fs_pwd
#endif /* HAVE_SET_FS_PWD */
-@@ -538,5 +561,56 @@
+@@ -141,7 +164,11 @@
+ #endif
+
+ /* XXX our code should be using the 2.6 calls, not the other way around */
++#ifdef HAVE_TESTSETPAGELOCKED
+ #define TryLockPage(page) TestSetPageLocked(page)
++#else
++#define TryLockPage(page) !trylock_page(page)
++#endif
+ #define Page_Uptodate(page) PageUptodate(page)
+ #define ll_redirty_page(page) set_page_dirty(page)
+
+@@ -538,5 +565,56 @@
#define ll_invalidate_bdev(a,b) invalidate_bdev((a))
#endif
@@ -2659,15 +2701,15 @@ diff -urNad
trunk~/lustre/include/linux/lustre_compat25.h trunk/lustre/include/l
+
#endif /* __KERNEL__ */
#endif /* _COMPAT25_H */
-diff -urNad trunk~/lustre/include/linux/lustre_lib.h
trunk/lustre/include/linux/lustre_lib.h
---- trunk~/lustre/include/linux/lustre_lib.h 2007-09-13 04:24:44.000000000
+0200
-+++ trunk/lustre/include/linux/lustre_lib.h 2008-09-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/include/linux/lustre_lib.h
lustre/lustre/include/linux/lustre_lib.h
+--- lustre~/lustre/include/linux/lustre_lib.h 2007-09-13 04:24:44.000000000
+0200
++++ lustre/lustre/include/linux/lustre_lib.h 2008-10-10 14:58:53.000000000
+0200
@@ -33,7 +33,11 @@
# include <string.h>
# include <sys/types.h>
#else
-# include <asm/semaphore.h>
-+# if HAVE_ASM_SEMAPHORE_H
++# ifdef HAVE_ASM_SEMAPHORE_H
+# include <asm/semaphore.h>
+# else
+# include <linux/semaphore.h>
@@ -2675,9 +2717,9 @@ diff -urNad trunk~/lustre/include/linux/lustre_lib.h
trunk/lustre/include/linux/
# include <linux/rwsem.h>
# include <linux/sched.h>
# include <linux/signal.h>
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/include/linux/lvfs.h
lustre/lustre/include/linux/lvfs.h
+--- lustre~/lustre/include/linux/lvfs.h 2007-07-26 08:24:10.000000000
+0200
++++ lustre/lustre/include/linux/lvfs.h 2008-10-10 14:58:53.000000000 +0200
@@ -47,7 +47,7 @@
struct upcall_cache_entry *luc_uce;
__u32 luc_fsuid;
@@ -2687,9 +2729,9 @@ diff -urNad trunk~/lustre/include/linux/lvfs.h
trunk/lustre/include/linux/lvfs.h
__u32 luc_suppgid1;
__u32 luc_suppgid2;
__u32 luc_umask;
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/include/lprocfs_status.h
lustre/lustre/include/lprocfs_status.h
+--- lustre~/lustre/include/lprocfs_status.h 2008-04-18 06:47:52.000000000
+0200
++++ lustre/lustre/include/lprocfs_status.h 2008-10-10 14:58:53.000000000
+0200
@@ -481,6 +481,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -2713,9 +2755,9 @@ diff -urNad trunk~/lustre/include/lprocfs_status.h
trunk/lustre/include/lprocfs_
/* You must use these macros when you want to refer to
* the import in a client obd_device for a lprocfs entry */
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/include/lustre_log.h
lustre/lustre/include/lustre_log.h
+--- lustre~/lustre/include/lustre_log.h 2007-08-24 13:12:48.000000000
+0200
++++ lustre/lustre/include/lustre_log.h 2008-10-10 14:58:53.000000000 +0200
@@ -218,14 +218,6 @@
void *llog_proc_cb;
};
@@ -2776,9 +2818,9 @@ diff -urNad trunk~/lustre/include/lustre_log.h
trunk/lustre/include/lustre_log.h
RETURN(rc);
}
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/include/lustre_mds.h
lustre/lustre/include/lustre_mds.h
+--- lustre~/lustre/include/lustre_mds.h 2008-04-24 06:41:00.000000000
+0200
++++ lustre/lustre/include/lustre_mds.h 2008-10-10 14:58:53.000000000 +0200
@@ -177,7 +177,7 @@
struct page *, struct ptlrpc_request **);
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -2788,9 +2830,9 @@ diff -urNad trunk~/lustre/include/lustre_mds.h
trunk/lustre/include/lustre_mds.h
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 trunk~/lustre/llite/file.c trunk/lustre/llite/file.c
---- trunk~/lustre/llite/file.c 2008-09-18 23:45:46.000000000 +0200
-+++ trunk/lustre/llite/file.c 2008-09-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
+--- lustre~/lustre/llite/file.c 2008-10-10 14:58:52.000000000 +0200
++++ lustre/lustre/llite/file.c 2008-10-10 14:58:53.000000000 +0200
@@ -1681,9 +1681,17 @@
/*
* Send file content (through pagecache) somewhere with helper
@@ -2922,9 +2964,9 @@ diff -urNad trunk~/lustre/llite/file.c
trunk/lustre/llite/file.c
.sendfile = ll_file_sendfile,
#endif
.fsync = ll_fsync,
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/llite/llite_internal.h
lustre/lustre/llite/llite_internal.h
+--- lustre~/lustre/llite/llite_internal.h 2008-04-26 16:30:54.000000000
+0200
++++ lustre/lustre/llite/llite_internal.h 2008-10-10 14:58:53.000000000
+0200
@@ -681,9 +681,6 @@
/* llite/llite_nfs.c */
extern struct export_operations lustre_export_operations;
@@ -2935,9 +2977,9 @@ diff -urNad trunk~/lustre/llite/llite_internal.h
trunk/lustre/llite/llite_intern
/* llite/special.c */
extern struct inode_operations ll_special_inode_operations;
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c
+--- lustre~/lustre/llite/llite_lib.c 2008-05-28 21:15:40.000000000 +0200
++++ lustre/lustre/llite/llite_lib.c 2008-10-10 14:58:53.000000000 +0200
@@ -1347,7 +1347,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -2947,9 +2989,9 @@ diff -urNad trunk~/lustre/llite/llite_lib.c
trunk/lustre/llite/llite_lib.c
ll_inode_size_unlock(inode, 0);
}
}
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
+--- lustre~/lustre/llite/llite_mmap.c 2008-03-27 04:32:37.000000000 +0100
++++ lustre/lustre/llite/llite_mmap.c 2008-10-10 14:58:53.000000000 +0200
@@ -38,9 +38,6 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -3289,9 +3331,9 @@ diff -urNad trunk~/lustre/llite/llite_mmap.c
trunk/lustre/llite/llite_mmap.c
if (!filemap_populate)
filemap_populate = vma->vm_ops->populate;
#endif
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
+--- lustre~/lustre/llite/llite_nfs.c 2008-04-24 06:41:05.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c 2008-10-10 14:58:53.000000000 +0200
@@ -40,11 +40,7 @@
return (key0 << 1);
}
@@ -3566,15 +3608,15 @@ diff -urNad trunk~/lustre/llite/llite_nfs.c
trunk/lustre/llite/llite_nfs.c
#endif
+ .get_parent = ll_get_parent,
+};
-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-18 23:53:22.000000000 +0200
+diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
+--- lustre~/lustre/llite/lloop.c 2007-11-21 13:11:10.000000000 +0100
++++ lustre/lustre/llite/lloop.c 2008-10-10 14:58:53.000000000 +0200
@@ -108,6 +108,10 @@
#define LLOOP_MAX_SEGMENTS PTLRPC_MAX_BRW_PAGES
+#ifndef HAVE_REQUEST_QUEUE_T
-+typedef struct request_queue request_queue_t
++typedef struct request_queue request_queue_t;
+#endif
+
/* Possible states of device */
@@ -3598,9 +3640,9 @@ diff -urNad trunk~/lustre/llite/lloop.c
trunk/lustre/llite/lloop.c
}
/*
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c
+--- lustre~/lustre/llite/namei.c 2008-04-24 06:41:06.000000000 +0200
++++ lustre/lustre/llite/namei.c 2008-10-10 14:58:53.000000000 +0200
@@ -879,7 +879,7 @@
err = mdc_create(sbi->ll_mdc_exp, &op_data, tgt, tgt_len,
@@ -3610,9 +3652,9 @@ diff -urNad trunk~/lustre/llite/namei.c
trunk/lustre/llite/namei.c
if (err)
GOTO(err_exit, err);
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
+--- lustre~/lustre/llite/rw.c 2008-04-03 05:23:43.000000000 +0200
++++ lustre/lustre/llite/rw.c 2008-10-10 15:22:17.000000000 +0200
@@ -161,7 +161,7 @@
GOTO(out_unlock, 0);
}
@@ -3622,9 +3664,21 @@ diff -urNad trunk~/lustre/llite/rw.c
trunk/lustre/llite/rw.c
if (!srvlock) {
struct ost_lvb lvb;
-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-18 23:45:47.000000000 +0200
+@@ -2092,7 +2092,11 @@
+ rc = generic_write_checks(file, ppos, &count, 0);
+ if (rc)
+ GOTO(out, rc);
++#ifdef HAVE_REMOVE_SUID
+ rc = remove_suid(file->f_dentry);
++#else
++ rc = file_remove_suid(file);
++#endif
+ if (rc)
+ GOTO(out, rc);
+ }
+diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
+--- lustre~/lustre/llite/symlink.c 2007-10-25 04:14:35.000000000 +0200
++++ lustre/lustre/llite/symlink.c 2008-10-10 14:58:53.000000000 +0200
@@ -156,8 +156,12 @@
rc = ll_readlink_internal(inode, &request, &symname);
up(&lli->lli_size_sem);
@@ -3638,9 +3692,9 @@ diff -urNad trunk~/lustre/llite/symlink.c
trunk/lustre/llite/symlink.c
GOTO(out, rc);
}
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c
+--- lustre~/lustre/lvfs/lvfs_linux.c 2007-10-30 06:25:57.000000000 +0100
++++ lustre/lustre/lvfs/lvfs_linux.c 2008-10-10 14:58:53.000000000 +0200
@@ -133,10 +133,10 @@
*/
@@ -3693,9 +3747,9 @@ diff -urNad trunk~/lustre/lvfs/lvfs_linux.c
trunk/lustre/lvfs/lvfs_linux.c
pop_group_info(saved, uc->luc_uce);
}
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/mdc/mdc_internal.h lustre/lustre/mdc/mdc_internal.h
+--- lustre~/lustre/mdc/mdc_internal.h 2008-01-17 14:00:30.000000000 +0100
++++ lustre/lustre/mdc/mdc_internal.h 2008-10-10 14:58:53.000000000 +0200
@@ -28,7 +28,7 @@
void *ea2, int ea2len);
void mdc_create_pack(struct ptlrpc_request *req, int offset,
@@ -3705,9 +3759,9 @@ diff -urNad trunk~/lustre/mdc/mdc_internal.h
trunk/lustre/mdc/mdc_internal.h
__u64 rdev);
void mdc_open_pack(struct ptlrpc_request *req, int offset,
struct mdc_op_data *op_data, __u32 mode, __u64 rdev,
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
+--- lustre~/lustre/mdc/mdc_lib.c 2008-03-26 07:22:04.000000000 +0100
++++ lustre/lustre/mdc/mdc_lib.c 2008-10-10 14:58:53.000000000 +0200
@@ -46,7 +46,7 @@
b = lustre_msg_buf(req->rq_reqmsg, offset, sizeof(*b));
b->fsuid = current->fsuid;
@@ -3798,9 +3852,9 @@ diff -urNad trunk~/lustre/mdc/mdc_lib.c
trunk/lustre/mdc/mdc_lib.c
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 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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/mdc/mdc_reint.c lustre/lustre/mdc/mdc_reint.c
+--- lustre~/lustre/mdc/mdc_reint.c 2008-02-18 13:43:18.000000000 +0100
++++ lustre/lustre/mdc/mdc_reint.c 2008-10-10 14:58:53.000000000 +0200
@@ -164,7 +164,7 @@
int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
@@ -3810,9 +3864,9 @@ diff -urNad trunk~/lustre/mdc/mdc_reint.c
trunk/lustre/mdc/mdc_reint.c
{
CFS_LIST_HEAD(cancels);
struct obd_device *obd = exp->exp_obd;
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
+--- lustre~/lustre/mgc/mgc_request.c 2008-04-24 13:54:15.000000000 +0200
++++ lustre/lustre/mgc/mgc_request.c 2008-10-10 14:58:53.000000000 +0200
@@ -395,7 +395,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3822,9 +3876,9 @@ diff -urNad trunk~/lustre/mgc/mgc_request.c
trunk/lustre/mgc/mgc_request.c
strlen(MOUNT_CONFIGS_DIR));
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (IS_ERR(dentry)) {
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/obdclass/linux/linux-module.c
lustre/lustre/obdclass/linux/linux-module.c
+--- lustre~/lustre/obdclass/linux/linux-module.c 2007-11-13
21:43:24.000000000 +0100
++++ lustre/lustre/obdclass/linux/linux-module.c 2008-10-10
14:58:53.000000000 +0200
@@ -386,7 +386,7 @@
ENTRY;
@@ -3834,9 +3888,9 @@ diff -urNad trunk~/lustre/obdclass/linux/linux-module.c
trunk/lustre/obdclass/li
if (!proc_lustre_root) {
printk(KERN_ERR
"LustreError: error registering /proc/fs/lustre\n");
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c
lustre/lustre/obdclass/linux/linux-sysctl.c
+--- lustre~/lustre/obdclass/linux/linux-sysctl.c 2008-03-25
13:25:41.000000000 +0100
++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2008-10-10
14:58:53.000000000 +0200
@@ -48,7 +48,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -4160,9 +4214,9 @@ diff -urNad trunk~/lustre/obdclass/linux/linux-sysctl.c
trunk/lustre/obdclass/li
};
void obd_sysctl_init (void)
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/obdclass/llog_obd.c
lustre/lustre/obdclass/llog_obd.c
+--- lustre~/lustre/obdclass/llog_obd.c 2007-12-24 21:15:32.000000000 +0100
++++ lustre/lustre/obdclass/llog_obd.c 2008-10-10 14:58:53.000000000 +0200
@@ -178,7 +178,7 @@
struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
int numcookies)
@@ -4185,9 +4239,9 @@ diff -urNad trunk~/lustre/obdclass/llog_obd.c
trunk/lustre/obdclass/llog_obd.c
RETURN(rc);
}
EXPORT_SYMBOL(llog_add);
-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-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/obdclass/lprocfs_status.c
lustre/lustre/obdclass/lprocfs_status.c
+--- lustre~/lustre/obdclass/lprocfs_status.c 2008-05-20 04:03:20.000000000
+0200
++++ lustre/lustre/obdclass/lprocfs_status.c 2008-10-10 14:58:53.000000000
+0200
@@ -117,6 +117,8 @@
proc->read_proc = read_proc;
proc->write_proc = write_proc;
@@ -4215,9 +4269,9 @@ diff -urNad trunk~/lustre/obdclass/lprocfs_status.c
trunk/lustre/obdclass/lprocf
rc = dp->write_proc(f, buf, size, dp->data);
LPROCFS_EXIT();
return rc;
-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-18 23:45:47.000000000 +0200
+diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
+--- lustre~/lustre/ptlrpc/service.c 2008-05-13 07:10:50.000000000 +0200
++++ lustre/lustre/ptlrpc/service.c 2008-10-10 14:58:53.000000000 +0200
@@ -1244,7 +1244,7 @@
cfs_daemonize(name);
exit_fs(cfs_current());
@@ -4227,9 +4281,9 @@ diff -urNad trunk~/lustre/ptlrpc/service.c
trunk/lustre/ptlrpc/service.c
}
static void
-diff -urNad trunk~/lustre/quota/quotacheck_test.c
trunk/lustre/quota/quotacheck_test.c
---- trunk~/lustre/quota/quotacheck_test.c 2008-01-03 07:31:16.000000000
+0100
-+++ trunk/lustre/quota/quotacheck_test.c 2008-09-18 23:45:47.000000000
+0200
+diff -urNad lustre~/lustre/quota/quotacheck_test.c
lustre/lustre/quota/quotacheck_test.c
+--- lustre~/lustre/quota/quotacheck_test.c 2008-01-03 07:31:16.000000000
+0100
++++ lustre/lustre/quota/quotacheck_test.c 2008-10-10 14:58:53.000000000
+0200
@@ -70,7 +70,14 @@
if (ext3_test_bit(index, bitmap_bh->b_data)) {
CERROR("i: %d, ino: %lu\n", index, ino);
--
Lustre Debian Packaging
_______________________________________________
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
