[Pkg-lustre-svn-commit] updated: [20ff0c6] Changed two configure checks as the also work on lower kernels

Patrick Winnertz winnie at debian.org
Fri Aug 21 12:23:17 UTC 2009


The following commit has been merged in the lustre-1.6 branch:
commit 20ff0c6c382940472366048ce50b16df358e14da
Author: Patrick Winnertz <winnie at debian.org>
Date:   Fri Aug 21 10:06:29 2009 +0200

    Changed two configure checks as the also work on lower kernels
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/patchless_support_2.6.30.dpatch b/debian/patches/patchless_support_2.6.30.dpatch
index 796ea56..eee766a 100755
--- a/debian/patches/patchless_support_2.6.30.dpatch
+++ b/debian/patches/patchless_support_2.6.30.dpatch
@@ -7,20 +7,28 @@
 @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-20 14:27:44.000000000 +0200
++++ lustre/build/autoMakefile.am.toplevel	2009-08-21 13:58:11.000000000 +0200
 @@ -51,7 +51,7 @@
  modules: $(DEP) all-sources
  	$(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ)		     \
  	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
 -        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \
-+        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Werror -Iarch/$(SUBARCH)/include -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \
++        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iarch/$(SUBARCH)/include -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \
  	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
  	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-20 14:27:44.000000000 +0200
-@@ -308,6 +308,24 @@
++++ lustre/build/autoconf/lustre-build-linux.m4	2009-08-21 13:58:11.000000000 +0200
+@@ -215,6 +215,7 @@
+ # this is needed before we can build modules
+ LB_LINUX_UML
+ LB_LINUX_VERSION
++LB_LINUX_SUBARCH
+ 
+ # --- check that we can build modules at all
+ AC_MSG_CHECKING([that modules can be built at all])
+@@ -308,6 +309,22 @@
  AC_SUBST(UML_CFLAGS)
  ])
  
@@ -29,8 +37,6 @@ diff -urNad lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/l
 +# SUBARCH of kernel
 +#
 +#
-+LB_LINUX_SUBARCH
-+
 +AC_DEFUN([LB_LINUX_SUBARCH],
 +[SUBARCH=
 +
@@ -47,7 +53,7 @@ diff -urNad lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/l
  
 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-20 14:27:44.000000000 +0200
++++ lustre/lnet/autoconf/lustre-lnet.m4	2009-08-21 13:58:11.000000000 +0200
 @@ -1362,6 +1362,22 @@
  ])
  ])
@@ -82,17 +88,18 @@ 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-20 14:32:25.000000000 +0200
-@@ -60,6 +60,14 @@
++++ lustre/lnet/include/libcfs/libcfs.h	2009-08-21 13:58:11.000000000 +0200
+@@ -60,6 +60,15 @@
  #include <stdio.h>
  #endif
  
++
 +#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
 +# define CRED(ts)		ts->cred
 +# define CREDENTIALS(ts,x)	CRED(ts)->x
 +#else
 +# define CRED(ts)		ts
-+# define CREDENTIALS(ts,x)	CRED(ts)->x
++# define CREDENTIALS(ts,x)	ts->x
 +#endif
 +
  /* Controlled via configure key */
@@ -100,7 +107,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-20 14:27:44.000000000 +0200
++++ lustre/lnet/include/lnet/types.h	2009-08-21 13:58:11.000000000 +0200
 @@ -39,6 +39,21 @@
  
  #include <libcfs/libcfs.h>
@@ -125,7 +132,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/klnds/socklnd/socklnd.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lnet/klnds/socklnd/socklnd.c	2009-08-21 13:58:11.000000000 +0200
 @@ -41,6 +41,7 @@
   * Author: Eric Barton <eric at bartonsoftware.com>
   */
@@ -136,7 +143,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-20 14:27:44.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-curproc.c	2009-08-21 13:58:11.000000000 +0200
 @@ -41,6 +41,7 @@
   */
  
@@ -246,7 +253,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-20 14:27:44.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-module.c	2009-08-21 13:58:11.000000000 +0200
 @@ -139,7 +139,7 @@
  	struct cfs_psdev_file	 pfile;
  	int    rc = 0;
@@ -258,7 +265,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-prim.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-prim.c	2009-08-21 13:58:11.000000000 +0200
 @@ -40,6 +40,7 @@
  #endif
  #include <linux/module.h>
@@ -278,7 +285,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/libcfs/linux/linux-tcpip.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lnet/libcfs/linux/linux-tcpip.c	2009-08-21 13:58:11.000000000 +0200
 @@ -63,7 +63,11 @@
                  return rc;
          }
@@ -293,7 +300,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lnet/lnet/api-ni.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lnet/lnet/api-ni.c	2009-08-21 13:58:11.000000000 +0200
 @@ -1032,7 +1032,7 @@
  #ifdef __KERNEL__
                  if (lnd == NULL) {
@@ -305,7 +312,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/autoconf/lustre-core.m4	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/autoconf/lustre-core.m4	2009-08-21 13:58:57.000000000 +0200
 @@ -1106,15 +1106,20 @@
  AC_DEFUN([LC_PAGE_CHECKED],
  [AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
@@ -371,7 +378,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,538 @@
+@@ -1268,11 +1295,542 @@
  
  # 2.6.23 extract nfs export related data into exportfs.h
  AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -712,9 +719,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/linux/quotaio_v1.h],[
++[LB_CHECK_FILE([$LINUX/include/quota/quotaio_v1.h],[
 +        AC_DEFINE(HAVE_QUOTAIO_V1_H, 1,
-+                [kernel has include/linux/quotaio_v1.h])
++                [kernel has include/quota/quotaio_v1.h])
 +],[
 +        AC_MSG_RESULT([no])
 +])
@@ -841,17 +848,18 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
 +])
 +])
 +
-+#2.6.30: 
-+AC_DEFUN([LC_COUNT_IN_STRUCT_FS_STRUCT],
++#2.6.30: count is replaced by user
++AC_DEFUN([LC_USERS_IN_STRUCT_FS_STRUCT],
 +[AC_MSG_CHECKING([is count in struct fs_struct available])
 +LB_LINUX_TRY_COMPILE([
++	#include <asm/atomic.h>
 +	#include <linux/fs_struct.h>
-+	#include <asm-generic/atomic.h>
 +],[
++	int foobar = 0;
 +	struct fs_struct *fs;
-+	atomic_inc(&fs->count);
++	fs->users = foobar;
 +],[
-+	AC_DEFINE(HAVE_COUNT_IN_STRUCT_FS_STRUCT, 1,
++	AC_DEFINE(HAVE_USERS_IN_STRUCT_FS_STRUCT, 1,
 +		[fs_struct counter replaced by user])
 +	AC_MSG_RESULT([yes])
 +],[
@@ -860,7 +868,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
 +])
 +
 +
-+#2.6.28
++#2.6.28: blkdev_put accepts two args 
 +AC_DEFUN([LC_BLKDEV_PUT_2ARGS],
 +[AC_MSG_CHECKING([accepts blkdev_put two arguments])
 +LB_LINUX_TRY_COMPILE([
@@ -878,16 +886,18 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
 +])
 +])
 +
-+#2.6.28:X6
++#2.6.28: arguments of open has changed (from open(inode, file) -> open(bdev,mode)
 +AC_DEFUN([LC_OPEN_BDEV_MODE],
 +[AC_MSG_CHECKING([which args needs bldev open])
 +LB_LINUX_TRY_COMPILE([
 +	#include <linux/types.h>
 +	#include <linux/blkdev.h>
++	#include <linux/fs.h>
 +],[
-+	int bar = 0;
++	extern int lo_open(struct block_device *bdev, fmode_t unused_mode);
++
 +	struct block_device_operations *foo;
-+	foo->open = bar;
++	foo->open = lo_open;
 +],[
 +	AC_DEFINE(HAVE_OPEN_BDEV_MODE, 1,
 +		[fs/block_dev method conversion; open(bdev, mode) instead of open(inode, file)])
@@ -897,16 +907,17 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
 +])
 +])
 +
-+
-+AC_DEFUN([LC_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS],
++#2.6.28: prepare_write()/commit_write() replaced by write_begin()/write_end()
++# reversed logic: we have to test if prepare_write exists.
++AC_DEFUN([LC_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS],
 +[AC_MSG_CHECKING([is write_begin/write_end available])
 +LB_LINUX_TRY_COMPILE([
 +	#include <linux/fs.h>
 +],[
 +	struct address_space_operations *foo;
-+	foo->write_begin = NULL;
++	foo->prepare_write = NULL;
 +],[
-+	AC_DEFINE(HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS, 1,
++	AC_DEFINE(HAVE_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS, 1,
 +		[prepare_write/commit_write replaced by write_begin/write_end])
 +	AC_MSG_RESULT([yes])
 +],[
@@ -915,7 +926,7 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
  ])
  
  #
-@@ -1372,8 +1926,54 @@
+@@ -1372,8 +1930,54 @@
            LC_FS_RENAME_DOES_D_MOVE
            # 2.6.23
            LC_UNREGISTER_BLKDEV_RETURN_INT
@@ -962,15 +973,15 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre
 +          LC_GET_GROUP_INFO
 +          LC_DENTRY_4ARGS
 +          LC_HAVE_D_ALLOC_ANON
-+          LC_COUNT_IN_STRUCT_FS_STRUCT
++          LC_USERS_IN_STRUCT_FS_STRUCT
 +          LC_BLKDEV_PUT_2ARGS
 +          LC_OPEN_BDEV_MODE
-+          LC_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++          LC_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
 +
  ])
  
  #
-@@ -1606,6 +2206,7 @@
+@@ -1606,6 +2210,7 @@
          ],[
                  AC_MSG_RESULT([no]) 
          ])
@@ -980,7 +991,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/liblustre.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/include/liblustre.h	2009-08-21 13:58:11.000000000 +0200
 @@ -586,6 +586,52 @@
          int signal;
  };
@@ -1045,7 +1056,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_compat25.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h	2009-08-21 13:58:11.000000000 +0200
 @@ -44,8 +44,8 @@
  #endif
  
@@ -1204,7 +1215,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_lib.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/include/linux/lustre_lib.h	2009-08-21 13:58:11.000000000 +0200
 @@ -49,7 +49,6 @@
  # include <string.h>
  # include <sys/types.h>
@@ -1215,7 +1226,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-08-19 09:51:08.000000000 +0200
-+++ lustre/lustre/include/linux/lustre_patchless_compat.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/include/linux/lustre_patchless_compat.h	2009-08-21 13:58:11.000000000 +0200
 @@ -52,7 +52,7 @@
  
          BUG_ON(!PageLocked(page));
@@ -1236,7 +1247,7 @@ diff -urNad lustre~/lustre/include/linux/lustre_patchless_compat.h lustre/lustre
  	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-20 14:27:44.000000000 +0200
++++ lustre/lustre/include/lprocfs_status.h	2009-08-21 13:58:11.000000000 +0200
 @@ -521,6 +521,8 @@
  #define LPROCFS_EXIT()            do {  \
          up_read(&_lprocfs_lock);        \
@@ -1271,7 +1282,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/include/lustre/ll_fiemap.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/include/lustre/ll_fiemap.h	2009-08-21 13:58:11.000000000 +0200
 @@ -86,7 +86,8 @@
  #define FIEMAP_EXTENT_UNKNOWN          0x00000002 /* Data location unknown. */
  #define FIEMAP_EXTENT_DELALLOC         0x00000004 /* Location still pending.
@@ -1345,16 +1356,16 @@ 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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/include/lustre_lite.h	2009-08-20 14:31:22.000000000 +0200
++++ lustre/lustre/include/lustre_lite.h	2009-08-21 13:58:11.000000000 +0200
 @@ -53,6 +53,16 @@
  #include <lustre_mds.h>
  #include <lustre_ha.h>
  
++
++
++
 +#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
-+# define CRED(ts)		ts->cred
-+# define CREDENTIALS(ts,x)	CRED(ts)->x
-+#else
-+# define CRED(ts)		ts
++# define CRED(ts)       	ts->cred
 +# define CREDENTIALS(ts,x)	CRED(ts)->x
 +#endif
 +
@@ -1365,7 +1376,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-20 14:27:44.000000000 +0200
++++ lustre/lustre/liblustre/lutil.c	2009-08-21 13:58:11.000000000 +0200
 @@ -176,7 +176,7 @@
  #define FAKE_ROOT_CAP 0x1ffffeff
  #define FAKE_USER_CAP 0
@@ -1384,7 +1395,7 @@ diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c
                  return 1;
  
          for (i = 0; i < current->ngroups; i++) {
-@@ -202,43 +202,54 @@
+@@ -202,43 +202,60 @@
                  CERROR("Not enough memory\n");
                  return -ENOMEM;
          }
@@ -1408,12 +1419,18 @@ diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c
          current->max_groups = sysconf(_SC_NGROUPS_MAX);
          current->groups = malloc(sizeof(gid_t) * current->max_groups);
          if (!current->groups) {
++#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
++		free(CRED(current));
++#endif
 +		free(current);		/* memory leak  -azi */
                  CERROR("Not enough memory\n");
                  return -ENOMEM;
          }
          current->ngroups = getgroups(current->max_groups, current->groups);
          if (current->ngroups < 0) {
++#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
++		free(CRED(current));
++#endif
 +		free(current->groups);	/* memory leak  -azi */
 +		free(current);		/* memory leak  -azi */
                  perror("Error getgroups");
@@ -1445,7 +1462,7 @@ diff -urNad lustre~/lustre/liblustre/lutil.c lustre/lustre/liblustre/lutil.c
  }
  
  void cfs_kernel_cap_pack(cfs_kernel_cap_t kcap, cfs_cap_t *cap)
-@@ -253,12 +264,12 @@
+@@ -253,12 +270,12 @@
  
  cfs_cap_t cfs_curproc_cap_pack(void) {
          cfs_cap_t cap;
@@ -1462,7 +1479,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/liblustre/super.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/liblustre/super.c	2009-08-21 13:58:11.000000000 +0200
 @@ -82,7 +82,7 @@
          struct intnl_stat *st = llu_i2stat(inode);
          mode_t mode = st->st_mode;
@@ -1516,7 +1533,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/dir.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/dir.c	2009-08-21 13:58:11.000000000 +0200
 @@ -955,7 +955,7 @@
                                  GOTO(out_quotactl, rc = -EPERM);
                          break;
@@ -1527,8 +1544,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-20 14:27:43.000000000 +0200
-+++ lustre/lustre/llite/file.c	2009-08-20 14:27:44.000000000 +0200
+--- 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
 @@ -1817,11 +1817,12 @@
  #endif
  }
@@ -1761,12 +1778,12 @@ 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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_internal.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/llite_internal.h	2009-08-21 13:58:11.000000000 +0200
 @@ -596,8 +596,13 @@
  void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
  
  /* llite/rw.c */
-+#ifdef HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++#ifndef HAVE_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
 +int ll_write_begin(struct file *, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **fsdata);
 +int ll_write_end(struct file *, struct address_space *mapping, loff_t pos, unsigned len, unsigned copied, struct page *page, void *fsdata);
 +#else
@@ -1797,7 +1814,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_lib.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/llite_lib.c	2009-08-21 13:58:11.000000000 +0200
 @@ -1346,7 +1346,7 @@
                  rc = vmtruncate(inode, new_size);
                  clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -1818,7 +1835,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_mmap.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/llite_mmap.c	2009-08-21 13:58:11.000000000 +0200
 @@ -81,8 +81,7 @@
  int lt_get_mmap_locks(struct ll_lock_tree *tree,
                        unsigned long addr, size_t count);
@@ -2118,7 +2135,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/llite_nfs.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c	2009-08-21 13:58:11.000000000 +0200
 @@ -68,36 +68,30 @@
  }
  
@@ -2415,7 +2432,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/lloop.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/lloop.c	2009-08-21 13:58:11.000000000 +0200
 @@ -152,7 +152,7 @@
          struct semaphore   lo_bh_mutex;
          atomic_t           lo_pending;
@@ -2589,7 +2606,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/lproc_llite.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/lproc_llite.c	2009-08-21 13:58:11.000000000 +0200
 @@ -649,7 +649,7 @@
                   sbi->ll_stats_track_id == current->p_pptr->pid)
                  lprocfs_counter_add(sbi->ll_stats, op, count);
@@ -2601,7 +2618,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/namei.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/namei.c	2009-08-21 13:58:11.000000000 +0200
 @@ -875,7 +875,7 @@
                  GOTO(err_exit, err);
  
@@ -2613,7 +2630,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/rw.c	2009-08-21 13:58:11.000000000 +0200
 @@ -61,6 +61,8 @@
  
  #define DEBUG_SUBSYSTEM S_LLITE
@@ -2636,7 +2653,7 @@ diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
          ll_inode_size_unlock(inode, 0);
  } /* ll_truncate */
  
-+#ifdef HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++#ifndef HAVE_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
 +int ll_write_begin(struct file *unused_file, struct address_space *mapping, loff_t pos, unsigned len, unsigned flags, struct page **pagep, void **unused_fsdata)
 +{
 +        struct inode *inode = mapping->host;
@@ -2739,7 +2756,7 @@ diff -urNad lustre~/lustre/llite/rw.c lustre/lustre/llite/rw.c
          RETURN(rc);
  }
  
-+#ifdef HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++#ifndef HAVE_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
 +int ll_write_end(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned copied, struct page *page, void *unued_fsdata)
 +{
 +        struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
@@ -2844,12 +2861,12 @@ 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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw24.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/rw24.c	2009-08-21 13:58:12.000000000 +0200
 @@ -150,8 +150,13 @@
          .readpage       = ll_readpage,
          .direct_IO      = ll_direct_IO_24,
          .writepage      = ll_writepage,
-+#ifdef HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++#ifndef HAVE_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
 +	.write_begin	= ll_write_begin,
 +	.write_end	= ll_write_end,
 +#else
@@ -2861,12 +2878,12 @@ 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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw26.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/rw26.c	2009-08-21 13:58:12.000000000 +0200
 @@ -339,8 +339,13 @@
          .writepages     = generic_writepages,
          .set_page_dirty = __set_page_dirty_nobuffers,
          .sync_page      = NULL,
-+#ifdef HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++#ifndef HAVE_WRITE_PREPARE_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
 +	.write_begin	= ll_write_begin,
 +	.write_end	= ll_write_end,
 +#else
@@ -2878,7 +2895,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/symlink.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/llite/symlink.c	2009-08-21 13:58:12.000000000 +0200
 @@ -177,8 +177,12 @@
                  up(&lli->lli_size_sem);
          }
@@ -2894,7 +2911,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt.c	2009-08-21 13:58:12.000000000 +0200
 @@ -50,7 +50,12 @@
  #include <linux/init.h>
  #include <linux/module.h>
@@ -2911,7 +2928,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c	2009-08-21 13:58:12.000000000 +0200
 @@ -50,7 +50,11 @@
  #include <linux/init.h>
  #include <linux/module.h>
@@ -2927,7 +2944,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/lvfs/lvfs_linux.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/lvfs/lvfs_linux.c	2009-08-21 13:58:12.000000000 +0200
 @@ -86,10 +86,19 @@
                  current_ngroups = 0;
          } else {
@@ -3054,7 +3071,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/mdc/mdc_lib.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/mdc/mdc_lib.c	2009-08-21 13:58:12.000000000 +0200
 @@ -56,8 +56,8 @@
          struct mds_body *b;
  
@@ -3145,7 +3162,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/mgc/mgc_request.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/mgc/mgc_request.c	2009-08-21 13:58:12.000000000 +0200
 @@ -415,7 +415,7 @@
          obd->obd_lvfs_ctxt.fs = get_ds();
  
@@ -3157,7 +3174,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-module.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-module.c	2009-08-21 13:58:12.000000000 +0200
 @@ -204,7 +204,7 @@
          int err = 0;
          ENTRY;
@@ -3186,7 +3203,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/linux/linux-sysctl.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-sysctl.c	2009-08-21 13:58:12.000000000 +0200
 @@ -56,7 +56,9 @@
  
  cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3461,7 +3478,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/lprocfs_status.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/obdclass/lprocfs_status.c	2009-08-21 13:58:12.000000000 +0200
 @@ -151,7 +151,7 @@
  
          LPROCFS_ENTRY();
@@ -3482,7 +3499,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/obdclass/lustre_handles.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/obdclass/lustre_handles.c	2009-08-21 13:58:12.000000000 +0200
 @@ -56,6 +56,14 @@
  # define rcu_read_unlock()       spin_unlock(&bucket->lock)
  #endif /* ifndef HAVE_RCU */
@@ -3500,12 +3517,12 @@ 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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/service.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/ptlrpc/service.c	2009-08-21 13:58:12.000000000 +0200
 @@ -1497,11 +1497,17 @@
  {
          struct fs_struct *fs = current->fs;
  
-+#ifndef HAVE_COUNT_IN_STRUCT_FS_STRUCT
++#ifdef HAVE_USERS_IN_STRUCT_FS_STRUCT
 +	write_lock(&fs->lock);
 +	fs->users++;
 +	write_unlock(&fs->lock);
@@ -3522,7 +3539,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/wiretest.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/ptlrpc/wiretest.c	2009-08-21 13:58:12.000000000 +0200
 @@ -2319,7 +2319,7 @@
          CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
          CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
@@ -3534,7 +3551,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/quota/quota_context.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/quota/quota_context.c	2009-08-21 13:58:12.000000000 +0200
 @@ -240,7 +240,11 @@
          int ret = 0;
          ENTRY;
@@ -3597,7 +3614,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/quota/quota_interface.c	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/quota/quota_interface.c	2009-08-21 13:58:12.000000000 +0200
 @@ -149,7 +149,11 @@
  {
          ENTRY;
@@ -3636,7 +3653,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/quota/quota_internal.h	2009-08-20 14:27:44.000000000 +0200
++++ lustre/lustre/quota/quota_internal.h	2009-08-21 13:58:12.000000000 +0200
 @@ -41,6 +41,14 @@
  
  #ifdef HAVE_QUOTA_SUPPORT
@@ -3654,7 +3671,7 @@ diff -urNad lustre~/lustre/quota/quota_internal.h lustre/lustre/quota/quota_inte
  
 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-20 14:27:44.000000000 +0200
++++ lustre/lustre/utils/wiretest.c	2009-08-21 13:58:12.000000000 +0200
 @@ -2317,7 +2317,7 @@
          CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
          CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);

-- 
Lustre Debian Packaging 



More information about the Pkg-lustre-svn-commit mailing list