The following commit has been merged in the lustre-1.6 branch:
commit 3568d7f77239c2515c541e2f58c063607ca72064
Author: Patrick Winnertz <win...@debian.org>
Date: Mon Sep 7 11:59:27 2009 +0200
Several smaller fixes for 2.6.30 build issues
- Add SUBARCH to LC_LINUX_TRY_COMPILE
- fixed typos
- added missing configure check for fiemap.h
- fixed path to quotaio_v1.h
- added missing #include <linux/spinlock.h>
- add missing -...@linux@/include to lustre/utils/Makefile.am
- add missing conditional to #if statement in lustre_types.h
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 4e76af7..00ca3d6 100755
--- a/debian/patches/patchless_support_2.6.30.dpatch
+++ b/debian/patches/patchless_support_2.6.30.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad lustre~/build/autoMakefile.am.toplevel
lustre/build/autoMakefile.am.toplevel
--- 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
++++ lustre/build/autoMakefile.am.toplevel 2009-09-08 12:01:16.000000000
+0200
@@ -51,7 +51,7 @@
modules: $(DEP) all-sources
$(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \
@@ -19,7 +19,7 @@ diff -urNad lustre~/build/autoMakefile.am.toplevel
lustre/build/autoMakefile.am.
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-09-07
10:18:03.000000000 +0200
-+++ lustre/build/autoconf/lustre-build-linux.m4 2009-09-07
10:32:30.000000000 +0200
++++ lustre/build/autoconf/lustre-build-linux.m4 2009-09-08
12:01:16.000000000 +0200
@@ -215,6 +215,7 @@
# this is needed before we can build modules
LB_LINUX_UML
@@ -56,13 +56,25 @@ diff -urNad lustre~/build/autoconf/lustre-build-linux.m4
lustre/build/autoconf/l
[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])],
++AS_IF([AC_TRY_COMMAND(SUBARCH=`uname -m | sed -e s/i.86/x86/ -e
s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e
s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh.*/sh/`; 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~/ldiskfs/build/autoconf/lustre-build-linux.m4
lustre/ldiskfs/build/autoconf/lustre-build-linux.m4
+--- lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 2009-09-07
10:18:05.000000000 +0200
++++ lustre/ldiskfs/build/autoconf/lustre-build-linux.m4 2009-09-08
12:01:16.000000000 +0200
+@@ -345,7 +345,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(SUBARCH=`uname -m | sed -e s/i.86/x86/ -e
s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/s390x/s390/ -e
s/parisc64/parisc/ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ -e s/sh.*/sh/`; 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-09-07 10:18:06.000000000
+0200
-+++ lustre/lnet/autoconf/lustre-lnet.m4 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/autoconf/lustre-lnet.m4 2009-09-08 12:01:16.000000000
+0200
@@ -1362,6 +1362,22 @@
])
])
@@ -97,7 +109,7 @@ 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-09-07 10:18:06.000000000
+0200
-+++ lustre/lnet/include/libcfs/libcfs.h 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/include/libcfs/libcfs.h 2009-09-08 12:01:16.000000000
+0200
@@ -60,6 +60,15 @@
#include <stdio.h>
#endif
@@ -116,7 +128,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-09-07 10:18:55.000000000 +0200
++++ lustre/lnet/include/lnet/types.h 2009-09-08 12:01:16.000000000 +0200
@@ -39,6 +39,21 @@
#include <libcfs/libcfs.h>
@@ -141,7 +153,7 @@ 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-09-07 10:18:08.000000000
+0200
-+++ lustre/lnet/klnds/socklnd/socklnd.c 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/klnds/socklnd/socklnd.c 2009-09-08 12:01:16.000000000
+0200
@@ -41,6 +41,7 @@
* Author: Eric Barton <e...@bartonsoftware.com>
*/
@@ -152,7 +164,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-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-curproc.c 2009-09-08 12:01:16.000000000
+0200
@@ -41,6 +41,7 @@
*/
@@ -262,7 +274,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-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-module.c 2009-09-08 12:01:16.000000000
+0200
@@ -139,7 +139,7 @@
struct cfs_psdev_file pfile;
int rc = 0;
@@ -274,7 +286,7 @@ 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-09-07 10:18:08.000000000
+0200
-+++ lustre/lnet/libcfs/linux/linux-prim.c 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-prim.c 2009-09-08 12:01:16.000000000
+0200
@@ -40,6 +40,7 @@
#endif
#include <linux/module.h>
@@ -294,7 +306,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-prim.c
lustre/lnet/libcfs/linux/linu
#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-09-07 10:18:08.000000000
+0200
-+++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lnet/libcfs/linux/linux-tcpip.c 2009-09-08 12:01:16.000000000
+0200
@@ -63,7 +63,11 @@
return rc;
}
@@ -309,7 +321,7 @@ diff -urNad lustre~/lnet/libcfs/linux/linux-tcpip.c
lustre/lnet/libcfs/linux/lin
sock_release(sock);
diff -urNad lustre~/lnet/lnet/api-ni.c lustre/lnet/lnet/api-ni.c
--- 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
++++ lustre/lnet/lnet/api-ni.c 2009-09-08 12:01:16.000000000 +0200
@@ -1032,7 +1032,7 @@
#ifdef __KERNEL__
if (lnd == NULL) {
@@ -321,7 +333,7 @@ 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-09-07 10:18:09.000000000
+0200
-+++ lustre/lustre/autoconf/lustre-core.m4 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/autoconf/lustre-core.m4 2009-09-08 12:01:16.000000000
+0200
@@ -1106,15 +1106,20 @@
AC_DEFUN([LC_PAGE_CHECKED],
[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
@@ -387,7 +399,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
AC_DEFUN([LC_KERNEL_SPLICE_READ],
[AC_MSG_CHECKING([if kernel has .splice_read])
LB_LINUX_TRY_COMPILE([
-@@ -1268,11 +1295,542 @@
+@@ -1268,11 +1295,543 @@
# 2.6.23 extract nfs export related data into exportfs.h
AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -728,9 +740,9 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
+
+# 2.6.27 sles11 move the quotaio_v1.h to fs
+AC_DEFUN([LC_HAVE_QUOTAIO_V1_H],
-+[LB_CHECK_FILE([$LINUX/include/quota/quotaio_v1.h],[
++[LB_CHECK_FILE([$LINUX/fs/quota/quotaio_v1.h],[
+ AC_DEFINE(HAVE_QUOTAIO_V1_H, 1,
-+ [kernel has include/quota/quotaio_v1.h])
++ [kernel has fs/quota/quotaio_v1.h])
+],[
+ AC_MSG_RESULT([no])
+])
@@ -812,7 +824,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
+AC_DEFUN([LC_GET_GROUP_INFO],
+[AC_MSG_CHECKING([use get_group_info on struct cred])
+LB_LINUX_TRY_COMPILE([
-+ #include <include/linux/cred.h>
++ #include <linux/cred.h>
+],[
+ get_group_info(NULL);
+],[
@@ -862,6 +874,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
+[AC_MSG_CHECKING([is count in struct fs_struct available])
+LB_LINUX_TRY_COMPILE([
+ #include <asm/atomic.h>
++ #include <linux/spinlock.h>
+ #include <linux/fs_struct.h>
+],[
+ int foobar = 0;
@@ -882,7 +895,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
+[AC_MSG_CHECKING([accepts blkdev_put two arguments])
+LB_LINUX_TRY_COMPILE([
+ #include <linux/types.h>
-+ #inlcude <linux/fs.h>
++ #include <linux/fs.h>
+],[
+ fmode_t foo = 0;
+ blkdev_put(NULL,foo);
@@ -935,7 +948,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
])
#
-@@ -1372,8 +1930,54 @@
+@@ -1372,8 +1931,55 @@
LC_FS_RENAME_DOES_D_MOVE
# 2.6.23
LC_UNREGISTER_BLKDEV_RETURN_INT
@@ -969,6 +982,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
+ LC_QUOTA_ON_5ARGS
+ LC_QUOTA_OFF_3ARGS
+ LC_VFS_DQ_OFF
++ LC_LINUX_FIEMAP_H
+
+ # 2.6.27.15-2 sles11
+ LC_BI_HW_SEGMENTS
@@ -990,7 +1004,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
])
#
-@@ -1606,6 +2210,7 @@
+@@ -1606,6 +2212,7 @@
],[
AC_MSG_RESULT([no])
])
@@ -1000,7 +1014,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4
lustre/lustre/autoconf/lustre
])
diff -urNad lustre~/lustre/include/liblustre.h
lustre/lustre/include/liblustre.h
--- 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
++++ lustre/lustre/include/liblustre.h 2009-09-08 12:01:16.000000000 +0200
@@ -586,6 +586,52 @@
int signal;
};
@@ -1065,7 +1079,7 @@ diff -urNad lustre~/lustre/include/liblustre.h
lustre/lustre/include/liblustre.h
#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-09-07
10:18:09.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_compat25.h 2009-09-07
10:18:55.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h 2009-09-08
12:01:16.000000000 +0200
@@ -44,8 +44,8 @@
#endif
@@ -1224,7 +1238,7 @@ diff -urNad
lustre~/lustre/include/linux/lustre_compat25.h lustre/lustre/include
{
diff -urNad lustre~/lustre/include/linux/lustre_lib.h
lustre/lustre/include/linux/lustre_lib.h
--- 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
++++ lustre/lustre/include/linux/lustre_lib.h 2009-09-08 12:01:16.000000000
+0200
@@ -49,7 +49,6 @@
# include <string.h>
# include <sys/types.h>
@@ -1235,7 +1249,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_lib.h
lustre/lustre/include/linu
# 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-09-07
10:18:09.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-09-07
10:18:55.000000000 +0200
++++ lustre/lustre/include/linux/lustre_patchless_compat.h 2009-09-08
12:01:16.000000000 +0200
@@ -52,7 +52,7 @@
BUG_ON(!PageLocked(page));
@@ -1254,9 +1268,21 @@ diff -urNad
lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre
write_unlock_irq(&mapping->tree_lock);
#else
spin_unlock_irq(&mapping->tree_lock);
+diff -urNad lustre~/lustre/include/linux/lustre_types.h
lustre/lustre/include/linux/lustre_types.h
+--- lustre~/lustre/include/linux/lustre_types.h 2008-12-18
18:55:29.000000000 +0100
++++ lustre/lustre/include/linux/lustre_types.h 2009-09-08 12:01:43.000000000
+0200
+@@ -59,7 +59,7 @@
+ !defined(_ASM_IA64_TYPES_H) && !defined(_X86_64_TYPES_H) && \
+ !defined(_PPC_TYPES_H) && !defined(_PPC64_TYPES_H) && \
+ !defined(_ASM_POWERPC_TYPES_H) && !defined(__mips64__) && \
+- !defined(_CRAYNV_TYPES_H)
++ !defined(_CRAYNV_TYPES_H) && !defined(_ASM_X86_TYPES_H)
+ /* yuck, would be nicer with _ASM_TYPES_H */
+
+ typedef unsigned short umode_t;
diff -urNad lustre~/lustre/include/lprocfs_status.h
lustre/lustre/include/lprocfs_status.h
--- 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
++++ lustre/lustre/include/lprocfs_status.h 2009-09-08 12:01:16.000000000
+0200
@@ -521,6 +521,8 @@
#define LPROCFS_EXIT() do { \
up_read(&_lprocfs_lock); \
@@ -1291,7 +1317,7 @@ diff -urNad lustre~/lustre/include/lprocfs_status.h
lustre/lustre/include/lprocf
#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-09-07 10:18:09.000000000
+0200
-+++ lustre/lustre/include/lustre/ll_fiemap.h 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/include/lustre/ll_fiemap.h 2009-09-08 12:01:16.000000000
+0200
@@ -86,7 +86,8 @@
#define FIEMAP_EXTENT_UNKNOWN 0x00000002 /* Data location unknown. */
#define FIEMAP_EXTENT_DELALLOC 0x00000004 /* Location still pending.
@@ -1365,7 +1391,7 @@ diff -urNad lustre~/lustre/include/lustre/ll_fiemap.h
lustre/lustre/include/lust
diff -urNad lustre~/lustre/include/lustre_lite.h
lustre/lustre/include/lustre_lite.h
--- 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
++++ lustre/lustre/include/lustre_lite.h 2009-09-08 12:01:16.000000000
+0200
@@ -53,6 +53,16 @@
#include <lustre_mds.h>
#include <lustre_ha.h>
@@ -1385,7 +1411,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-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/liblustre/lutil.c 2009-09-08 12:01:16.000000000 +0200
@@ -176,7 +176,7 @@
#define FAKE_ROOT_CAP 0x1ffffeff
#define FAKE_USER_CAP 0
@@ -1488,7 +1514,7 @@ 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-09-07 10:18:10.000000000 +0200
-+++ lustre/lustre/liblustre/super.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/liblustre/super.c 2009-09-08 12:01:16.000000000 +0200
@@ -82,7 +82,7 @@
struct intnl_stat *st = llu_i2stat(inode);
mode_t mode = st->st_mode;
@@ -1542,7 +1568,7 @@ diff -urNad lustre~/lustre/liblustre/super.c
lustre/lustre/liblustre/super.c
liblustre_wait_event(0);
diff -urNad lustre~/lustre/llite/dir.c lustre/lustre/llite/dir.c
--- 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
++++ lustre/lustre/llite/dir.c 2009-09-08 12:01:16.000000000 +0200
@@ -955,7 +955,7 @@
GOTO(out_quotactl, rc = -EPERM);
break;
@@ -1553,8 +1579,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-09-07 10:18:53.000000000 +0200
-+++ lustre/lustre/llite/file.c 2009-09-07 10:18:55.000000000 +0200
+--- lustre~/lustre/llite/file.c 2009-09-08 12:01:16.000000000 +0200
++++ lustre/lustre/llite/file.c 2009-09-08 12:01:16.000000000 +0200
@@ -1817,11 +1817,12 @@
#endif
}
@@ -1787,7 +1813,7 @@ diff -urNad lustre~/lustre/llite/file.c
lustre/lustre/llite/file.c
.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-09-07 10:18:11.000000000
+0200
-+++ lustre/lustre/llite/llite_internal.h 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/llite/llite_internal.h 2009-09-08 12:01:16.000000000
+0200
@@ -596,8 +596,13 @@
void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
@@ -1823,7 +1849,7 @@ diff -urNad lustre~/lustre/llite/llite_internal.h
lustre/lustre/llite/llite_inte
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-09-07 10:18:11.000000000 +0200
-+++ lustre/lustre/llite/llite_lib.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/llite/llite_lib.c 2009-09-08 12:01:16.000000000 +0200
@@ -1346,7 +1346,7 @@
rc = vmtruncate(inode, new_size);
clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -1844,7 +1870,7 @@ diff -urNad lustre~/lustre/llite/llite_lib.c
lustre/lustre/llite/llite_lib.c
}
diff -urNad lustre~/lustre/llite/llite_mmap.c lustre/lustre/llite/llite_mmap.c
--- 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
++++ lustre/lustre/llite/llite_mmap.c 2009-09-08 12:01:16.000000000 +0200
@@ -81,8 +81,7 @@
int lt_get_mmap_locks(struct ll_lock_tree *tree,
unsigned long addr, size_t count);
@@ -2144,7 +2170,7 @@ diff -urNad lustre~/lustre/llite/llite_mmap.c
lustre/lustre/llite/llite_mmap.c
#endif
diff -urNad lustre~/lustre/llite/llite_nfs.c lustre/lustre/llite/llite_nfs.c
--- 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
++++ lustre/lustre/llite/llite_nfs.c 2009-09-08 12:01:16.000000000 +0200
@@ -68,36 +68,30 @@
}
@@ -2441,7 +2467,7 @@ 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-09-07 10:18:11.000000000 +0200
-+++ lustre/lustre/llite/lloop.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/llite/lloop.c 2009-09-08 12:01:16.000000000 +0200
@@ -152,7 +152,7 @@
struct semaphore lo_bh_mutex;
atomic_t lo_pending;
@@ -2615,7 +2641,7 @@ 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-09-07 10:18:11.000000000 +0200
-+++ lustre/lustre/llite/lproc_llite.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/llite/lproc_llite.c 2009-09-08 12:01:16.000000000 +0200
@@ -649,7 +649,7 @@
sbi->ll_stats_track_id == current->p_pptr->pid)
lprocfs_counter_add(sbi->ll_stats, op, count);
@@ -2627,7 +2653,7 @@ 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-09-07 10:18:11.000000000 +0200
-+++ lustre/lustre/llite/namei.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/llite/namei.c 2009-09-08 12:01:16.000000000 +0200
@@ -875,7 +875,7 @@
GOTO(err_exit, err);
@@ -2639,7 +2665,7 @@ diff -urNad lustre~/lustre/llite/namei.c
lustre/lustre/llite/namei.c
GOTO(err_exit, err);
diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
--- 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
++++ lustre/lustre/llite/rw.c 2009-09-08 12:01:16.000000000 +0200
@@ -61,6 +61,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
@@ -2870,7 +2896,7 @@ diff -urNad lustre~/lustre/llite/rw.c
lustre/lustre/llite/rw.c
}
diff -urNad lustre~/lustre/llite/rw24.c lustre/lustre/llite/rw24.c
--- 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
++++ lustre/lustre/llite/rw24.c 2009-09-08 12:01:16.000000000 +0200
@@ -150,8 +150,13 @@
.readpage = ll_readpage,
.direct_IO = ll_direct_IO_24,
@@ -2887,7 +2913,7 @@ diff -urNad lustre~/lustre/llite/rw24.c
lustre/lustre/llite/rw24.c
.bmap = NULL,
diff -urNad lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c
--- 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
++++ lustre/lustre/llite/rw26.c 2009-09-08 12:01:16.000000000 +0200
@@ -339,8 +339,13 @@
.writepages = generic_writepages,
.set_page_dirty = __set_page_dirty_nobuffers,
@@ -2904,7 +2930,7 @@ diff -urNad lustre~/lustre/llite/rw26.c
lustre/lustre/llite/rw26.c
.bmap = NULL
diff -urNad lustre~/lustre/llite/symlink.c lustre/lustre/llite/symlink.c
--- 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
++++ lustre/lustre/llite/symlink.c 2009-09-08 12:01:16.000000000 +0200
@@ -177,8 +177,12 @@
up(&lli->lli_size_sem);
}
@@ -2920,7 +2946,7 @@ 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-09-07 10:18:11.000000000
+0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/lvfs/lustre_quota_fmt.c 2009-09-08 12:01:16.000000000
+0200
@@ -50,7 +50,12 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -2937,7 +2963,7 @@ diff -urNad lustre~/lustre/lvfs/lustre_quota_fmt.c
lustre/lustre/lvfs/lustre_quo
#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-09-07
10:18:11.000000000 +0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-09-07
10:18:55.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c 2009-09-08
12:01:16.000000000 +0200
@@ -50,7 +50,11 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -2953,7 +2979,7 @@ diff -urNad
lustre~/lustre/lvfs/lustre_quota_fmt_convert.c lustre/lustre/lvfs/lu
#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-09-07 10:18:11.000000000 +0200
-+++ lustre/lustre/lvfs/lvfs_linux.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/lvfs/lvfs_linux.c 2009-09-08 12:01:16.000000000 +0200
@@ -86,10 +86,19 @@
current_ngroups = 0;
} else {
@@ -3080,7 +3106,7 @@ diff -urNad lustre~/lustre/lvfs/lvfs_linux.c
lustre/lustre/lvfs/lvfs_linux.c
diff -urNad lustre~/lustre/mdc/mdc_lib.c lustre/lustre/mdc/mdc_lib.c
--- 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
++++ lustre/lustre/mdc/mdc_lib.c 2009-09-08 12:01:16.000000000 +0200
@@ -56,8 +56,8 @@
struct mds_body *b;
@@ -3171,7 +3197,7 @@ diff -urNad lustre~/lustre/mdc/mdc_lib.c
lustre/lustre/mdc/mdc_lib.c
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-09-07 10:18:11.000000000 +0200
-+++ lustre/lustre/mgc/mgc_request.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/mgc/mgc_request.c 2009-09-08 12:01:16.000000000 +0200
@@ -415,7 +415,7 @@
obd->obd_lvfs_ctxt.fs = get_ds();
@@ -3183,7 +3209,7 @@ diff -urNad lustre~/lustre/mgc/mgc_request.c
lustre/lustre/mgc/mgc_request.c
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-09-07
10:18:11.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-module.c 2009-09-07
10:18:55.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-module.c 2009-09-08
12:01:16.000000000 +0200
@@ -204,7 +204,7 @@
int err = 0;
ENTRY;
@@ -3212,7 +3238,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-module.c
lustre/lustre/obdclass/
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-09-07
10:18:11.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-09-07
10:18:55.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-sysctl.c 2009-09-08
12:01:16.000000000 +0200
@@ -56,7 +56,9 @@
cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3487,7 +3513,7 @@ diff -urNad lustre~/lustre/obdclass/linux/linux-sysctl.c
lustre/lustre/obdclass/
.maxlen = 0,
diff -urNad lustre~/lustre/obdclass/lprocfs_status.c
lustre/lustre/obdclass/lprocfs_status.c
--- 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
++++ lustre/lustre/obdclass/lprocfs_status.c 2009-09-08 12:01:16.000000000
+0200
@@ -151,7 +151,7 @@
LPROCFS_ENTRY();
@@ -3508,7 +3534,7 @@ diff -urNad lustre~/lustre/obdclass/lprocfs_status.c
lustre/lustre/obdclass/lpro
return rc;
diff -urNad lustre~/lustre/obdclass/lustre_handles.c
lustre/lustre/obdclass/lustre_handles.c
--- 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
++++ lustre/lustre/obdclass/lustre_handles.c 2009-09-08 12:01:16.000000000
+0200
@@ -56,6 +56,14 @@
# define rcu_read_unlock() spin_unlock(&bucket->lock)
#endif /* ifndef HAVE_RCU */
@@ -3526,7 +3552,7 @@ diff -urNad lustre~/lustre/obdclass/lustre_handles.c
lustre/lustre/obdclass/lust
static spinlock_t handle_base_lock;
diff -urNad lustre~/lustre/ptlrpc/service.c lustre/lustre/ptlrpc/service.c
--- 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
++++ lustre/lustre/ptlrpc/service.c 2009-09-08 12:01:16.000000000 +0200
@@ -1497,11 +1497,17 @@
{
struct fs_struct *fs = current->fs;
@@ -3548,7 +3574,7 @@ 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-09-07 10:18:12.000000000 +0200
-+++ lustre/lustre/ptlrpc/wiretest.c 2009-09-07 10:18:55.000000000 +0200
++++ lustre/lustre/ptlrpc/wiretest.c 2009-09-08 12:01:16.000000000 +0200
@@ -2319,7 +2319,7 @@
CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
@@ -3560,7 +3586,7 @@ diff -urNad lustre~/lustre/ptlrpc/wiretest.c
lustre/lustre/ptlrpc/wiretest.c
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-09-07 10:18:12.000000000
+0200
-+++ lustre/lustre/quota/quota_context.c 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/quota/quota_context.c 2009-09-08 12:01:16.000000000
+0200
@@ -240,7 +240,11 @@
int ret = 0;
ENTRY;
@@ -3623,7 +3649,7 @@ 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-09-07 10:18:12.000000000
+0200
-+++ lustre/lustre/quota/quota_interface.c 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/quota/quota_interface.c 2009-09-08 12:01:16.000000000
+0200
@@ -149,7 +149,11 @@
{
ENTRY;
@@ -3662,7 +3688,7 @@ 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-09-07 10:18:12.000000000
+0200
-+++ lustre/lustre/quota/quota_internal.h 2009-09-07 10:18:55.000000000
+0200
++++ lustre/lustre/quota/quota_internal.h 2009-09-08 12:01:16.000000000
+0200
@@ -41,6 +41,14 @@
#ifdef HAVE_QUOTA_SUPPORT
@@ -3678,9 +3704,21 @@ diff -urNad lustre~/lustre/quota/quota_internal.h
lustre/lustre/quota/quota_inte
/* QUSG covnert bytes to blocks when counting block quota */
#define QUSG(count, isblk) (isblk ? toqb(count) : count)
+diff -urNad lustre~/lustre/utils/Makefile.am lustre/lustre/utils/Makefile.am
+--- lustre~/lustre/utils/Makefile.am 2009-09-07 10:18:12.000000000 +0200
++++ lustre/lustre/utils/Makefile.am 2009-09-08 12:01:16.000000000 +0200
+@@ -1,7 +1,7 @@
+ # Administration utilities Makefile
+
+ AM_CFLAGS=$(LLCFLAGS)
+-AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
++AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1 -...@linux@/include
+ AM_LDFLAGS := -L$(top_builddir)/lnet/utils
+
+ LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a
diff -urNad lustre~/lustre/utils/wiretest.c lustre/lustre/utils/wiretest.c
--- 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
++++ lustre/lustre/utils/wiretest.c 2009-09-08 12:01:16.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
