The following commit has been merged in the lustre-1.6 branch:
commit edd72a1f1b6b1a9697ed60605719f2752d053732
Author: Patrick Winnertz <win...@debian.org>
Date: Mon Sep 7 10:32:57 2009 +0200
Include -I$LINUX_OBJ/arch/$SUBARCH/include into the configure tests
Signed-off-by: Patrick Winnertz <win...@debian.org>
diff --git a/debian/patches/patchless_support_2.6.30.dpatch
b/debian/patches/patchless_support_2.6.30.dpatch
index eee766a..4e76af7 100755
--- a/debian/patches/patchless_support_2.6.30.dpatch
+++ b/debian/patches/patchless_support_2.6.30.dpatch
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad lustre~/build/autoMakefile.am.toplevel
lustre/build/autoMakefile.am.toplevel
---- lustre~/build/autoMakefile.am.toplevel 2009-08-19 09:51:07.000000000
+0200
-+++ lustre/build/autoMakefile.am.toplevel 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/build/autoMakefile.am.toplevel 2009-09-07 10:18:03.000000000
+0200
++++ lustre/build/autoMakefile.am.toplevel 2009-09-07 10:18:55.000000000
+0200
@@ -51,7 +51,7 @@
modules: $(DEP) all-sources
$(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \
@@ -18,8 +18,8 @@ diff -urNad lustre~/build/autoMakefile.am.toplevel
lustre/build/autoMakefile.am.
include/config/MARKER $@
endif # LINUX
diff -urNad lustre~/build/autoconf/lustre-build-linux.m4
lustre/build/autoconf/lustre-build-linux.m4
---- lustre~/build/autoconf/lustre-build-linux.m4 2009-08-19
09:51:07.000000000 +0200
-+++ lustre/build/autoconf/lustre-build-linux.m4 2009-08-21
13:58:11.000000000 +0200
+--- lustre~/build/autoconf/lustre-build-linux.m4 2009-09-07
10:18:03.000000000 +0200
++++ lustre/build/autoconf/lustre-build-linux.m4 2009-09-07
10:32:30.000000000 +0200
@@ -215,6 +215,7 @@
# this is needed before we can build modules
LB_LINUX_UML
@@ -51,9 +51,18 @@ diff -urNad lustre~/build/autoconf/lustre-build-linux.m4
lustre/build/autoconf/l
# these are like AC_TRY_COMPILE, but try to build modules against the
# kernel, inside the build directory
+@@ -345,7 +362,7 @@
+ AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
+ [m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
+-AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"}
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include
-I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends
-o scripts -o include/config/MARKER -C $LINUX_OBJ
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
++AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"}
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/include -I$LINUX_OBJ/include
-I$LINUX_OBJ/include2 -I$LINUX_OBJ/arch/$SUBARCH/include -include
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o
include/config/MARKER -C $LINUX_OBJ
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+ [$4],
+ [_AC_MSG_LOG_CONFTEST
+ m4_ifvaln([$5],[$5])dnl])dnl
diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4
lustre/lnet/autoconf/lustre-lnet.m4
---- lustre~/lnet/autoconf/lustre-lnet.m4 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lnet/autoconf/lustre-lnet.m4 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lnet/autoconf/lustre-lnet.m4 2009-09-07 10:18:06.000000000
+0200
++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-09-07 10:18:55.000000000
+0200
@@ -1362,6 +1362,22 @@
])
])
@@ -87,8 +96,8 @@ diff -urNad lustre~/lnet/autoconf/lustre-lnet.m4
lustre/lnet/autoconf/lustre-lne
#
diff -urNad lustre~/lnet/include/libcfs/libcfs.h
lustre/lnet/include/libcfs/libcfs.h
---- lustre~/lnet/include/libcfs/libcfs.h 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lnet/include/libcfs/libcfs.h 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lnet/include/libcfs/libcfs.h 2009-09-07 10:18:06.000000000
+0200
++++ lustre/lnet/include/libcfs/libcfs.h 2009-09-07 10:18:55.000000000
+0200
@@ -60,6 +60,15 @@
#include <stdio.h>
#endif
@@ -107,7 +116,7 @@ diff -urNad lustre~/lnet/include/libcfs/libcfs.h
lustre/lnet/include/libcfs/libc
diff -urNad lustre~/lnet/include/lnet/types.h lustre/lnet/include/lnet/types.h
--- lustre~/lnet/include/lnet/types.h 2008-08-07 11:50:16.000000000 +0200
-+++ lustre/lnet/include/lnet/types.h 2009-08-21 13:58:11.000000000 +0200
++++ lustre/lnet/include/lnet/types.h 2009-09-07 10:18:55.000000000 +0200
@@ -39,6 +39,21 @@
#include <libcfs/libcfs.h>
@@ -131,8 +140,8 @@ diff -urNad lustre~/lnet/include/lnet/types.h
lustre/lnet/include/lnet/types.h
typedef __u64 lnet_nid_t;
diff -urNad lustre~/lnet/klnds/socklnd/socklnd.c
lustre/lnet/klnds/socklnd/socklnd.c
---- lustre~/lnet/klnds/socklnd/socklnd.c 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lnet/klnds/socklnd/socklnd.c 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lnet/klnds/socklnd/socklnd.c 2009-09-07 10:18:08.000000000
+0200
++++ lustre/lnet/klnds/socklnd/socklnd.c 2009-09-07 10:18:55.000000000
+0200
@@ -41,6 +41,7 @@
* Author: Eric Barton <e...@bartonsoftware.com>
*/
@@ -143,7 +152,7 @@ diff -urNad lustre~/lnet/klnds/socklnd/socklnd.c
lustre/lnet/klnds/socklnd/sockl
lnd_t the_ksocklnd = {
diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c
lustre/lnet/libcfs/linux/linux-curproc.c
--- lustre~/lnet/libcfs/linux/linux-curproc.c 2008-11-20 10:27:06.000000000
+0100
-+++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-08-21 13:58:11.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-09-07 10:18:55.000000000
+0200
@@ -41,6 +41,7 @@
*/
@@ -253,7 +262,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-curproc.c
lustre/lnet/libcfs/linux/l
int cfs_capable(cfs_cap_t cap)
diff -urNad lustre~/lnet/libcfs/linux/linux-module.c
lustre/lnet/libcfs/linux/linux-module.c
--- lustre~/lnet/libcfs/linux/linux-module.c 2008-09-15 20:44:53.000000000
+0200
-+++ lustre/lnet/libcfs/linux/linux-module.c 2009-08-21 13:58:11.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-module.c 2009-09-07 10:18:55.000000000
+0200
@@ -139,7 +139,7 @@
struct cfs_psdev_file pfile;
int rc = 0;
@@ -264,8 +273,8 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-module.c
lustre/lnet/libcfs/linux/li
if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c
lustre/lnet/libcfs/linux/linux-prim.c
---- lustre~/lnet/libcfs/linux/linux-prim.c 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lnet/libcfs/linux/linux-prim.c 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lnet/libcfs/linux/linux-prim.c 2009-09-07 10:18:08.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-prim.c 2009-09-07 10:18:55.000000000
+0200
@@ -40,6 +40,7 @@
#endif
#include <linux/module.h>
@@ -284,8 +293,8 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c
lustre/lnet/libcfs/linux/linu
asm("int $3");
#else
diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c
lustre/lnet/libcfs/linux/linux-tcpip.c
---- lustre~/lnet/libcfs/linux/linux-tcpip.c 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lnet/libcfs/linux/linux-tcpip.c 2009-09-07 10:18:08.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-09-07 10:18:55.000000000
+0200
@@ -63,7 +63,11 @@
return rc;
}
@@ -299,8 +308,8 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c
lustre/lnet/libcfs/linux/lin
rc = fd;
sock_release(sock);
diff -urNad lustre~/lnet/lnet/api-ni.c lustre/lnet/lnet/api-ni.c
---- lustre~/lnet/lnet/api-ni.c 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/lnet/api-ni.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lnet/lnet/api-ni.c 2009-09-07 10:18:08.000000000 +0200
++++ lustre/lnet/lnet/api-ni.c 2009-09-07 10:18:55.000000000 +0200
@@ -1032,7 +1032,7 @@
#ifdef __KERNEL__
if (lnd == NULL) {
@@ -311,8 +320,8 @@ diff -urNad lustre~/lnet/lnet/api-ni.c
lustre/lnet/lnet/api-ni.c
lnd = lnet_find_lnd_by_type(lnd_type);
diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lustre/autoconf/lustre-core.m4 2009-08-21 13:58:57.000000000
+0200
+--- lustre~/lustre/autoconf/lustre-core.m4 2009-09-07 10:18:09.000000000
+0200
++++ lustre/lustre/autoconf/lustre-core.m4 2009-09-07 10:18:55.000000000
+0200
@@ -1106,15 +1106,20 @@
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
@@ -990,8 +999,8 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
AC_MSG_RESULT([no])
])
diff -urNad lustre~/lustre/include/liblustre.h
lustre/lustre/include/liblustre.h
---- lustre~/lustre/include/liblustre.h 2009-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/liblustre.h 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/include/liblustre.h 2009-09-07 10:18:09.000000000 +0200
++++ lustre/lustre/include/liblustre.h 2009-09-07 10:18:55.000000000 +0200
@@ -586,6 +586,52 @@
int signal;
};
@@ -1055,8 +1064,8 @@ diff -urNad lustre~/lustre/include/liblustre.h
lustre/lustre/include/liblustre.h
#define cfs_current() current
#define cfs_curproc_pid() (current->pid)
diff -urNad lustre~/lustre/include/linux/lustre_compat25.h
lustre/lustre/include/linux/lustre_compat25.h
---- lustre~/lustre/include/linux/lustre_compat25.h 2009-08-19
09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_compat25.h 2009-08-21
13:58:11.000000000 +0200
+--- lustre~/lustre/include/linux/lustre_compat25.h 2009-09-07
10:18:09.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h 2009-09-07
10:18:55.000000000 +0200
@@ -44,8 +44,8 @@
#endif
@@ -1214,8 +1223,8 @@ diff -urNad
lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include
static inline int abs(int x)
{
diff -urNad lustre~/lustre/include/linux/lustre_lib.h
lustre/lustre/include/linux/lustre_lib.h
---- lustre~/lustre/include/linux/lustre_lib.h 2009-08-19 09:51:08.000000000
+0200
-+++ lustre/lustre/include/linux/lustre_lib.h 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lustre/include/linux/lustre_lib.h 2009-09-07 10:18:09.000000000
+0200
++++ lustre/lustre/include/linux/lustre_lib.h 2009-09-07 10:18:55.000000000
+0200
@@ -49,7 +49,6 @@
# include <string.h>
# include <sys/types.h>
@@ -1225,8 +1234,8 @@ diff -urNad lustre~/lustre/include/linux/lustre_lib.h
lustre/lustre/include/linu
# include <linux/sched.h>
# include <linux/signal.h>
diff -urNad lustre~/lustre/include/linux/lustre_patchless_compat.h
lustre/lustre/include/linux/lustre_patchless_compat.h
---- lustre~/lustre/include/linux/lustre_patchless_compat.h 2009-08-19
09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-08-21
13:58:11.000000000 +0200
+--- lustre~/lustre/include/linux/lustre_patchless_compat.h 2009-09-07
10:18:09.000000000 +0200
++++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-09-07
10:18:55.000000000 +0200
@@ -52,7 +52,7 @@
BUG_ON(!PageLocked(page));
@@ -1246,8 +1255,8 @@ diff -urNad
lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre
#else
spin_unlock_irq(&mapping->tree_lock);
diff -urNad lustre~/lustre/include/lprocfs_status.h
lustre/lustre/include/lprocfs_status.h
---- lustre~/lustre/include/lprocfs_status.h 2009-08-19 09:51:09.000000000
+0200
-+++ lustre/lustre/include/lprocfs_status.h 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lustre/include/lprocfs_status.h 2009-09-07 10:18:09.000000000
+0200
++++ lustre/lustre/include/lprocfs_status.h 2009-09-07 10:18:55.000000000
+0200
@@ -521,6 +521,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -1281,8 +1290,8 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h
lustre/lustre/include/lprocf
* the import in a client obd_device for a lprocfs entry */
#define LPROCFS_CLIMP_CHECK(obd) do { \
diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h
lustre/lustre/include/lustre/ll_fiemap.h
---- lustre~/lustre/include/lustre/ll_fiemap.h 2009-08-19 09:51:09.000000000
+0200
-+++ lustre/lustre/include/lustre/ll_fiemap.h 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lustre/include/lustre/ll_fiemap.h 2009-09-07 10:18:09.000000000
+0200
++++ lustre/lustre/include/lustre/ll_fiemap.h 2009-09-07 10:18:55.000000000
+0200
@@ -86,7 +86,8 @@
#define FIEMAP_EXTENT_UNKNOWN 0x00000002 /* Data location unknown. */
#define FIEMAP_EXTENT_DELALLOC 0x00000004 /* Location still pending.
@@ -1355,8 +1364,8 @@ diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h
lustre/lustre/include/lust
#endif /* HAVE_LINUX_FIEMAP_H */
diff -urNad lustre~/lustre/include/lustre_lite.h
lustre/lustre/include/lustre_lite.h
---- lustre~/lustre/include/lustre_lite.h 2009-08-19 09:51:09.000000000
+0200
-+++ lustre/lustre/include/lustre_lite.h 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lustre/include/lustre_lite.h 2009-09-07 10:18:09.000000000
+0200
++++ lustre/lustre/include/lustre_lite.h 2009-09-07 10:18:55.000000000
+0200
@@ -53,6 +53,16 @@
#include <lustre_mds.h>
#include <lustre_ha.h>
@@ -1376,7 +1385,7 @@ diff -urNad lustre~/lustre/include/lustre_lite.h
lustre/lustre/include/lustre_li
/* careful, this is easy to screw up */
diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c
--- lustre~/lustre/liblustre/lutil.c 2009-08-11 12:37:07.000000000 +0200
-+++ lustre/lustre/liblustre/lutil.c 2009-08-21 13:58:11.000000000 +0200
++++ lustre/lustre/liblustre/lutil.c 2009-09-07 10:18:55.000000000 +0200
@@ -176,7 +176,7 @@
#define FAKE_ROOT_CAP 0x1ffffeff
#define FAKE_USER_CAP 0
@@ -1478,8 +1487,8 @@ diff -urNad lustre~/lustre/liblustre/lutil.c
lustre/lustre/liblustre/lutil.c
int cfs_capable(cfs_cap_t cap)
diff -urNad lustre~/lustre/liblustre/super.c lustre/lustre/liblustre/super.c
---- lustre~/lustre/liblustre/super.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/liblustre/super.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/liblustre/super.c 2009-09-07 10:18:10.000000000 +0200
++++ lustre/lustre/liblustre/super.c 2009-09-07 10:18:55.000000000 +0200
@@ -82,7 +82,7 @@
struct intnl_stat *st = llu_i2stat(inode);
mode_t mode = st->st_mode;
@@ -1532,8 +1541,8 @@ diff -urNad lustre~/lustre/liblustre/super.c
lustre/lustre/liblustre/super.c
ptlrpc_req_finished(request);
liblustre_wait_event(0);
diff -urNad lustre~/lustre/llite/dir.c lustre/lustre/llite/dir.c
---- lustre~/lustre/llite/dir.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/dir.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/dir.c 2009-09-07 10:18:10.000000000 +0200
++++ lustre/lustre/llite/dir.c 2009-09-07 10:18:55.000000000 +0200
@@ -955,7 +955,7 @@
GOTO(out_quotactl, rc = -EPERM);
break;
@@ -1544,8 +1553,8 @@ diff -urNad lustre~/lustre/llite/dir.c
lustre/lustre/llite/dir.c
!cfs_capable(CFS_CAP_SYS_ADMIN))
GOTO(out_quotactl, rc = -EPERM);
diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c 2009-08-21 13:58:11.000000000 +0200
-+++ lustre/lustre/llite/file.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/file.c 2009-09-07 10:18:53.000000000 +0200
++++ lustre/lustre/llite/file.c 2009-09-07 10:18:55.000000000 +0200
@@ -1817,11 +1817,12 @@
#endif
}
@@ -1777,8 +1786,8 @@ diff -urNad lustre~/lustre/llite/file.c
lustre/lustre/llite/file.c
#ifdef HAVE_F_OP_FLOCK
.flock = ll_file_noflock,
diff -urNad lustre~/lustre/llite/llite_internal.h
lustre/lustre/llite/llite_internal.h
---- lustre~/lustre/llite/llite_internal.h 2009-08-19 09:51:09.000000000
+0200
-+++ lustre/lustre/llite/llite_internal.h 2009-08-21 13:58:11.000000000
+0200
+--- lustre~/lustre/llite/llite_internal.h 2009-09-07 10:18:11.000000000
+0200
++++ lustre/lustre/llite/llite_internal.h 2009-09-07 10:18:55.000000000
+0200
@@ -596,8 +596,13 @@
void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
@@ -1813,8 +1822,8 @@ diff -urNad lustre~/lustre/llite/llite_internal.h
lustre/lustre/llite/llite_inte
/* llite/special.c */
extern struct inode_operations ll_special_inode_operations;
diff -urNad lustre~/lustre/llite/llite_lib.c lustre/lustre/llite/llite_lib.c
---- lustre~/lustre/llite/llite_lib.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_lib.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/llite_lib.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/llite_lib.c 2009-09-07 10:18:55.000000000 +0200
@@ -1346,7 +1346,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -1834,8 +1843,8 @@ diff -urNad lustre~/lustre/llite/llite_lib.c
lustre/lustre/llite/llite_lib.c
RETURN(-EPERM);
}
diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
---- lustre~/lustre/llite/llite_mmap.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_mmap.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/llite_mmap.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/llite_mmap.c 2009-09-07 10:18:55.000000000 +0200
@@ -81,8 +81,7 @@
int lt_get_mmap_locks(struct ll_lock_tree *tree,
unsigned long addr, size_t count);
@@ -2134,8 +2143,8 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c
lustre/lustre/llite/llite_mmap.c
filemap_populate = vma->vm_ops->populate;
#endif
diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
---- lustre~/lustre/llite/llite_nfs.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_nfs.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/llite_nfs.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c 2009-09-07 10:18:55.000000000 +0200
@@ -68,36 +68,30 @@
}
@@ -2431,8 +2440,8 @@ diff -urNad lustre~/lustre/llite/llite_nfs.c
lustre/lustre/llite/llite_nfs.c
};
#endif
diff -urNad lustre~/lustre/llite/lloop.c lustre/lustre/llite/lloop.c
---- lustre~/lustre/llite/lloop.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/lloop.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/lloop.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/lloop.c 2009-09-07 10:18:55.000000000 +0200
@@ -152,7 +152,7 @@
struct semaphore lo_bh_mutex;
atomic_t lo_pending;
@@ -2605,8 +2614,8 @@ diff -urNad lustre~/lustre/llite/lloop.c
lustre/lustre/llite/lloop.c
}
if (ll_unregister_blkdev(lloop_major, "lloop"))
diff -urNad lustre~/lustre/llite/lproc_llite.c
lustre/lustre/llite/lproc_llite.c
---- lustre~/lustre/llite/lproc_llite.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/lproc_llite.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/lproc_llite.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/lproc_llite.c 2009-09-07 10:18:55.000000000 +0200
@@ -649,7 +649,7 @@
sbi->ll_stats_track_id == current->p_pptr->pid)
lprocfs_counter_add(sbi->ll_stats, op, count);
@@ -2617,8 +2626,8 @@ diff -urNad lustre~/lustre/llite/lproc_llite.c
lustre/lustre/llite/lproc_llite.c
}
EXPORT_SYMBOL(ll_stats_ops_tally);
diff -urNad lustre~/lustre/llite/namei.c lustre/lustre/llite/namei.c
---- lustre~/lustre/llite/namei.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/namei.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/namei.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/namei.c 2009-09-07 10:18:55.000000000 +0200
@@ -875,7 +875,7 @@
GOTO(err_exit, err);
@@ -2629,8 +2638,8 @@ diff -urNad lustre~/lustre/llite/namei.c
lustre/lustre/llite/namei.c
if (err)
GOTO(err_exit, err);
diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
---- lustre~/lustre/llite/rw.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw.c 2009-08-21 13:58:11.000000000 +0200
+--- lustre~/lustre/llite/rw.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/rw.c 2009-09-07 10:18:55.000000000 +0200
@@ -61,6 +61,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
@@ -2860,8 +2869,8 @@ diff -urNad lustre~/lustre/llite/rw.c
lustre/lustre/llite/rw.c
GOTO(out, rc);
}
diff -urNad lustre~/lustre/llite/rw24.c lustre/lustre/llite/rw24.c
---- lustre~/lustre/llite/rw24.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw24.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/llite/rw24.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/rw24.c 2009-09-07 10:18:55.000000000 +0200
@@ -150,8 +150,13 @@
.readpage = ll_readpage,
.direct_IO = ll_direct_IO_24,
@@ -2877,8 +2886,8 @@ diff -urNad lustre~/lustre/llite/rw24.c
lustre/lustre/llite/rw24.c
.sync_page = NULL,
.bmap = NULL,
diff -urNad lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c
---- lustre~/lustre/llite/rw26.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw26.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/llite/rw26.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/rw26.c 2009-09-07 10:18:55.000000000 +0200
@@ -339,8 +339,13 @@
.writepages = generic_writepages,
.set_page_dirty = __set_page_dirty_nobuffers,
@@ -2894,8 +2903,8 @@ diff -urNad lustre~/lustre/llite/rw26.c
lustre/lustre/llite/rw26.c
.releasepage = ll_releasepage,
.bmap = NULL
diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
---- lustre~/lustre/llite/symlink.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/symlink.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/llite/symlink.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/llite/symlink.c 2009-09-07 10:18:55.000000000 +0200
@@ -177,8 +177,12 @@
up(&lli->lli_size_sem);
}
@@ -2910,8 +2919,8 @@ diff -urNad lustre~/lustre/llite/symlink.c
lustre/lustre/llite/symlink.c
}
diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c
lustre/lustre/lvfs/lustre_quota_fmt.c
---- lustre~/lustre/lvfs/lustre_quota_fmt.c 2009-08-19 09:51:09.000000000
+0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-08-21 13:58:12.000000000
+0200
+--- lustre~/lustre/lvfs/lustre_quota_fmt.c 2009-09-07 10:18:11.000000000
+0200
++++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-09-07 10:18:55.000000000
+0200
@@ -50,7 +50,12 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -2927,8 +2936,8 @@ diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c
lustre/lustre/lvfs/lustre_quo
#include <asm/byteorder.h>
#include <asm/uaccess.h>
diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt_convert.c
lustre/lustre/lvfs/lustre_quota_fmt_convert.c
---- lustre~/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-19
09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-08-21
13:58:12.000000000 +0200
+--- lustre~/lustre/lvfs/lustre_quota_fmt_convert.c 2009-09-07
10:18:11.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-09-07
10:18:55.000000000 +0200
@@ -50,7 +50,11 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -2943,8 +2952,8 @@ diff -urNad
lustre~/lustre/lvfs/lustre_quota_fmt_convert.c lustre/lustre/lvfs/lu
#include <asm/byteorder.h>
#include <asm/uaccess.h>
diff -urNad lustre~/lustre/lvfs/lvfs_linux.c lustre/lustre/lvfs/lvfs_linux.c
---- lustre~/lustre/lvfs/lvfs_linux.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lvfs_linux.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/lvfs/lvfs_linux.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/lvfs/lvfs_linux.c 2009-09-07 10:18:55.000000000 +0200
@@ -86,10 +86,19 @@
current_ngroups = 0;
} else {
@@ -3070,8 +3079,8 @@ diff -urNad lustre~/lustre/lvfs/lvfs_linux.c
lustre/lustre/lvfs/lvfs_linux.c
EXPORT_SYMBOL(l_dentry_open);
diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
---- lustre~/lustre/mdc/mdc_lib.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/mdc/mdc_lib.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/mdc/mdc_lib.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/mdc/mdc_lib.c 2009-09-07 10:18:55.000000000 +0200
@@ -56,8 +56,8 @@
struct mds_body *b;
@@ -3161,8 +3170,8 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c
lustre/lustre/mdc/mdc_lib.c
b->valid = valid;
b->flags = flags | MDS_BFLAG_EXT_FLAGS;
diff -urNad lustre~/lustre/mgc/mgc_request.c lustre/lustre/mgc/mgc_request.c
---- lustre~/lustre/mgc/mgc_request.c 2009-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/mgc/mgc_request.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/mgc/mgc_request.c 2009-09-07 10:18:11.000000000 +0200
++++ lustre/lustre/mgc/mgc_request.c 2009-09-07 10:18:55.000000000 +0200
@@ -415,7 +415,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3173,8 +3182,8 @@ diff -urNad lustre~/lustre/mgc/mgc_request.c
lustre/lustre/mgc/mgc_request.c
pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
if (IS_ERR(dentry)) {
diff -urNad lustre~/lustre/obdclass/linux/linux-module.c
lustre/lustre/obdclass/linux/linux-module.c
---- lustre~/lustre/obdclass/linux/linux-module.c 2009-08-19
09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-module.c 2009-08-21
13:58:12.000000000 +0200
+--- lustre~/lustre/obdclass/linux/linux-module.c 2009-09-07
10:18:11.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-module.c 2009-09-07
10:18:55.000000000 +0200
@@ -204,7 +204,7 @@
int err = 0;
ENTRY;
@@ -3202,8 +3211,8 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-module.c
lustre/lustre/obdclass/
if (entry == NULL) {
CERROR("error registering /proc/fs/lustre/devices\n");
diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c
lustre/lustre/obdclass/linux/linux-sysctl.c
---- lustre~/lustre/obdclass/linux/linux-sysctl.c 2009-08-19
09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-08-21
13:58:12.000000000 +0200
+--- lustre~/lustre/obdclass/linux/linux-sysctl.c 2009-09-07
10:18:11.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-09-07
10:18:55.000000000 +0200
@@ -56,7 +56,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3477,8 +3486,8 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c
lustre/lustre/obdclass/
.data = NULL,
.maxlen = 0,
diff -urNad lustre~/lustre/obdclass/lprocfs_status.c
lustre/lustre/obdclass/lprocfs_status.c
---- lustre~/lustre/obdclass/lprocfs_status.c 2009-08-19 09:51:10.000000000
+0200
-+++ lustre/lustre/obdclass/lprocfs_status.c 2009-08-21 13:58:12.000000000
+0200
+--- lustre~/lustre/obdclass/lprocfs_status.c 2009-09-07 10:18:11.000000000
+0200
++++ lustre/lustre/obdclass/lprocfs_status.c 2009-09-07 10:18:55.000000000
+0200
@@ -151,7 +151,7 @@
LPROCFS_ENTRY();
@@ -3498,8 +3507,8 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c
lustre/lustre/obdclass/lpro
LPROCFS_EXIT();
return rc;
diff -urNad lustre~/lustre/obdclass/lustre_handles.c
lustre/lustre/obdclass/lustre_handles.c
---- lustre~/lustre/obdclass/lustre_handles.c 2009-08-19 09:51:10.000000000
+0200
-+++ lustre/lustre/obdclass/lustre_handles.c 2009-08-21 13:58:12.000000000
+0200
+--- lustre~/lustre/obdclass/lustre_handles.c 2009-09-07 10:18:11.000000000
+0200
++++ lustre/lustre/obdclass/lustre_handles.c 2009-09-07 10:18:55.000000000
+0200
@@ -56,6 +56,14 @@
# define rcu_read_unlock() spin_unlock(&bucket->lock)
#endif /* ifndef HAVE_RCU */
@@ -3516,8 +3525,8 @@ diff -urNad lustre~/lustre/obdclass/lustre_handles.c
lustre/lustre/obdclass/lust
#define HANDLE_INCR 7
static spinlock_t handle_base_lock;
diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
---- lustre~/lustre/ptlrpc/service.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/service.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/ptlrpc/service.c 2009-09-07 10:18:12.000000000 +0200
++++ lustre/lustre/ptlrpc/service.c 2009-09-07 10:18:55.000000000 +0200
@@ -1497,11 +1497,17 @@
{
struct fs_struct *fs = current->fs;
@@ -3538,8 +3547,8 @@ diff -urNad lustre~/lustre/ptlrpc/service.c
lustre/lustre/ptlrpc/service.c
static void
diff -urNad lustre~/lustre/ptlrpc/wiretest.c lustre/lustre/ptlrpc/wiretest.c
---- lustre~/lustre/ptlrpc/wiretest.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/wiretest.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/ptlrpc/wiretest.c 2009-09-07 10:18:12.000000000 +0200
++++ lustre/lustre/ptlrpc/wiretest.c 2009-09-07 10:18:55.000000000 +0200
@@ -2319,7 +2319,7 @@
CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
@@ -3550,8 +3559,8 @@ diff -urNad lustre~/lustre/ptlrpc/wiretest.c
lustre/lustre/ptlrpc/wiretest.c
CLASSERT(FIEMAP_EXTENT_NET == 0x00000020);
CLASSERT(FIEMAP_EXTENT_DATA_COMPRESSED == 0x00000040);
diff -urNad lustre~/lustre/quota/quota_context.c
lustre/lustre/quota/quota_context.c
---- lustre~/lustre/quota/quota_context.c 2009-08-19 09:51:10.000000000
+0200
-+++ lustre/lustre/quota/quota_context.c 2009-08-21 13:58:12.000000000
+0200
+--- lustre~/lustre/quota/quota_context.c 2009-09-07 10:18:12.000000000
+0200
++++ lustre/lustre/quota/quota_context.c 2009-09-07 10:18:55.000000000
+0200
@@ -240,7 +240,11 @@
int ret = 0;
ENTRY;
@@ -3613,8 +3622,8 @@ diff -urNad lustre~/lustre/quota/quota_context.c
lustre/lustre/quota/quota_conte
data.obd = obd;
diff -urNad lustre~/lustre/quota/quota_interface.c
lustre/lustre/quota/quota_interface.c
---- lustre~/lustre/quota/quota_interface.c 2009-08-19 09:51:10.000000000
+0200
-+++ lustre/lustre/quota/quota_interface.c 2009-08-21 13:58:12.000000000
+0200
+--- lustre~/lustre/quota/quota_interface.c 2009-09-07 10:18:12.000000000
+0200
++++ lustre/lustre/quota/quota_interface.c 2009-09-07 10:18:55.000000000
+0200
@@ -149,7 +149,11 @@
{
ENTRY;
@@ -3652,8 +3661,8 @@ diff -urNad lustre~/lustre/quota/quota_interface.c
lustre/lustre/quota/quota_int
spin_lock(&qctxt->lqc_lock);
diff -urNad lustre~/lustre/quota/quota_internal.h
lustre/lustre/quota/quota_internal.h
---- lustre~/lustre/quota/quota_internal.h 2009-08-19 09:51:10.000000000
+0200
-+++ lustre/lustre/quota/quota_internal.h 2009-08-21 13:58:12.000000000
+0200
+--- lustre~/lustre/quota/quota_internal.h 2009-09-07 10:18:12.000000000
+0200
++++ lustre/lustre/quota/quota_internal.h 2009-09-07 10:18:55.000000000
+0200
@@ -41,6 +41,14 @@
#ifdef HAVE_QUOTA_SUPPORT
@@ -3670,8 +3679,8 @@ diff -urNad lustre~/lustre/quota/quota_internal.h
lustre/lustre/quota/quota_inte
#define QUSG(count, isblk) (isblk ? toqb(count) : count)
diff -urNad lustre~/lustre/utils/wiretest.c lustre/lustre/utils/wiretest.c
---- lustre~/lustre/utils/wiretest.c 2009-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/utils/wiretest.c 2009-08-21 13:58:12.000000000 +0200
+--- lustre~/lustre/utils/wiretest.c 2009-09-07 10:18:12.000000000 +0200
++++ lustre/lustre/utils/wiretest.c 2009-09-07 10:18:55.000000000 +0200
@@ -2317,7 +2317,7 @@
CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
--
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
