The following commit has been merged in the lustre-1.6 branch:
commit f2d14e633e2beae9f1ee40d762feaa17288aa7f3
Author: Patrick Winnertz <win...@debian.org>
Date:   Thu Aug 20 12:16:44 2009 +0200

    Updated patch from Axel and added some 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 c591b85..febb909 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-08-19 09:51:07.000000000 
+0200
-+++ lustre/build/autoMakefile.am.toplevel      2009-08-20 10:25:20.000000000 
+0200
++++ lustre/build/autoMakefile.am.toplevel      2009-08-20 12:12:43.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-08-19 
09:51:07.000000000 +0200
-+++ lustre/build/autoconf/lustre-build-linux.m4        2009-08-20 
10:25:20.000000000 +0200
++++ lustre/build/autoconf/lustre-build-linux.m4        2009-08-20 
12:12:43.000000000 +0200
 @@ -308,6 +308,24 @@
  AC_SUBST(UML_CFLAGS)
  ])
@@ -47,7 +47,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 10:25:20.000000000 
+0200
++++ lustre/lnet/autoconf/lustre-lnet.m4        2009-08-20 12:12:43.000000000 
+0200
 @@ -1362,6 +1362,22 @@
  ])
  ])
@@ -82,7 +82,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-08-19 09:51:08.000000000 
+0200
-+++ lustre/lnet/include/libcfs/libcfs.h        2009-08-20 10:25:20.000000000 
+0200
++++ lustre/lnet/include/libcfs/libcfs.h        2009-08-20 12:12:43.000000000 
+0200
 @@ -60,6 +60,11 @@
  #include <stdio.h>
  #endif
@@ -97,7 +97,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 10:25:20.000000000 +0200
++++ lustre/lnet/include/lnet/types.h   2009-08-20 12:12:43.000000000 +0200
 @@ -39,6 +39,21 @@
  
  #include <libcfs/libcfs.h>
@@ -122,7 +122,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 10:25:20.000000000 
+0200
++++ lustre/lnet/klnds/socklnd/socklnd.c        2009-08-20 12:12:43.000000000 
+0200
 @@ -41,6 +41,7 @@
   * Author: Eric Barton <e...@bartonsoftware.com>
   */
@@ -133,7 +133,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 10:25:20.000000000 
+0200
++++ lustre/lnet/libcfs/linux/linux-curproc.c   2009-08-20 12:12:43.000000000 
+0200
 @@ -41,6 +41,7 @@
   */
  
@@ -243,7 +243,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 10:25:20.000000000 
+0200
++++ lustre/lnet/libcfs/linux/linux-module.c    2009-08-20 12:12:43.000000000 
+0200
 @@ -139,7 +139,7 @@
        struct cfs_psdev_file    pfile;
        int    rc = 0;
@@ -255,7 +255,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 10:25:20.000000000 
+0200
++++ lustre/lnet/libcfs/linux/linux-prim.c      2009-08-20 12:12:43.000000000 
+0200
 @@ -40,6 +40,7 @@
  #endif
  #include <linux/module.h>
@@ -275,7 +275,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 10:25:20.000000000 
+0200
++++ lustre/lnet/libcfs/linux/linux-tcpip.c     2009-08-20 12:12:43.000000000 
+0200
 @@ -63,7 +63,11 @@
                  return rc;
          }
@@ -290,7 +290,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 10:25:20.000000000 +0200
++++ lustre/lnet/lnet/api-ni.c  2009-08-20 12:12:43.000000000 +0200
 @@ -1032,7 +1032,7 @@
  #ifdef __KERNEL__
                  if (lnd == NULL) {
@@ -302,7 +302,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 10:25:20.000000000 
+0200
++++ lustre/lustre/autoconf/lustre-core.m4      2009-08-20 12:12:43.000000000 
+0200
 @@ -1106,15 +1106,20 @@
  AC_DEFUN([LC_PAGE_CHECKED],
  [AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
@@ -368,7 +368,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,466 @@
+@@ -1268,11 +1295,530 @@
  
  # 2.6.23 extract nfs export related data into exportfs.h
  AC_DEFUN([LC_HAVE_EXPORTFS_H],
@@ -793,10 +793,9 @@ 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 <linux/sched.h>
 +      #include <include/linux/cred.h>
 +],[
-+      #TODO: this needs to be written
++      get_group_info(NULL);
 +],[
 +      AC_DEFINE(HAVE_GET_GROUP_INFO, 1,
 +              [struct task_struct {} introduces struct cred * to keep task 
credentials: use get_group_info/put_group_info])
@@ -806,14 +805,30 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 
lustre/lustre/autoconf/lustre
 +])
 +])
 +
++#2.6.29
++AC_DEFUN([LC_DENTRY_4ARGS],
++[AC_MSG_CHECKING([if dentry accepts 4 args])
++LB_LINUX_TRY_COMPILE([
++      #include <linux/fs.h>
++],[
++      int foo = 0;
++      dentry_open(NULL,NULL,foo,NULL);
++],[
++      AC_DEFINE(HAVE_DENTRY_4ARGS, 1,
++              [dentry_open accepts 4 arguments])
++      AC_MSG_RESULT([yes])
++],[
++      AC_MSG_RESULT([no])
++])
++])
 +
 +#2.6.29: is d_alloc_anon available
 +AC_DEFUN([LC_HAVE_D_ALLOC_ANON],
-+[AC_MSG_CHECKING([is d_alloc_annon declared in dache.h])
++[AC_MSG_CHECKING([is d_alloc_anon declared in dache.h])
 +LB_LINUX_TRY_COMPILE([
 +      #include <linux/dcache.h>
 +],[
-+      d_alloc_annon(NULL);
++      d_alloc_anon(NULL);
 +],[
 +      AC_DEFINE(HAVE_D_ALLOC_ANON, 1,
 +              [dcache.h no longer declares d_alloc_anon - d_obtain_alias does 
about the same])
@@ -837,10 +852,59 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 
lustre/lustre/autoconf/lustre
 +],[
 +      AC_MSG_RESULT([no])
 +])
++])
++
++
++#2.6.28
++AC_DEFUN([LC_BLKDEV_PUT_2ARGS],
++[AC_MSG_CHECKING([accepts blkdev_put to arguments])
++LB_LINUX_TRY_COMPILE([
++      #include <TODO.h>
++],[
++      blkdev_put(NULL,NULL);
++],[
++      AC_DEFINE(HAVE_BLKDEV_PUT_2ARGS, 1,
++              [fmode_t is passed to blkdev_put])
++      AC_MSG_RESULT([yes])
++],[
++      AC_MSG_RESULT([no])
++])
++])
++
++#2.6.28:
++AC_DEFUN([LC_OPEN_BDEV_MODE],
++[AC_MSG_CHECKING([which args needs bldev open])
++LB_LINUX_TRY_COMPILE([
++      #include <TODO.h>
++],[
++      open(foo, bar); //TODO
++],[
++      AC_DEFINE(HAVE_OPEN_BDEV_MODE, 1,
++              [fs/block_dev method conversion; open(bdev, mode) instead of 
open(inode, file)])
++      AC_MSG_RESULT([yes])
++],[
++      AC_MSG_RESULT([no])
++])
++])
++
++
++AC_DEFUN(LC_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS],
++[AC_MSG_CHECKING([is write_begin/write_end available])
++LB_LINUX_TRY_COMPILE([
++      #include <TODO.h>
++],[
++      #TODO
++],[
++      AC_DEFINE(HAVE_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS, 1,
++              [prepare_write/commit_write replaced by write_begin/write_end])
++      AC_MSG_RESULT([yes])
++],[
++      AC_MSG_RESULT([no])
++])
  ])
  
  #
-@@ -1372,8 +1854,45 @@
+@@ -1372,8 +1918,54 @@
            LC_FS_RENAME_DOES_D_MOVE
            # 2.6.23
            LC_UNREGISTER_BLKDEV_RETURN_INT
@@ -869,24 +933,33 @@ diff -urNad lustre~/lustre/autoconf/lustre-core.m4 
lustre/lustre/autoconf/lustre
 +          LC_FILE_REMOVE_SUID
 +          LC_TRYLOCKPAGE
 +          LC_RW_TREE_LOCK
-+          #done until here
-+          LC_READ_INODE_IN_SBOPS #done
-+          LC_EXPORT_INODE_PERMISSION #done
-+          LC_QUOTA_ON_5ARGS #done
-+          LC_QUOTA_OFF_3ARGS #done
-+          LC_VFS_DQ_OFF #done
-+
-+          # 2.6.27.15-2 sles11 
-+          LC_BI_HW_SEGMENTS #done
-+          LC_HAVE_QUOTAIO_V1_H #done
-+          LC_VFS_SYMLINK_5ARGS #done
++          LC_READ_INODE_IN_SBOPS
++          LC_EXPORT_INODE_PERMISSION
++          LC_QUOTA_ON_5ARGS
++          LC_QUOTA_OFF_3ARGS
++          LC_VFS_DQ_OFF
++
++          # 2.6.27.15-2 sles11
++          LC_BI_HW_SEGMENTS
++          LC_HAVE_QUOTAIO_V1_H
++          LC_VFS_SYMLINK_5ARGS
 +          LC_SB_ANY_QUOTA_ACTIVE
 +          LC_SB_HAS_QUOTA_ACTIVE
 +
++          #2.6.28 or later - needs to be written
++          LC_CRED_IN_STRUCT_TASK_STRUCT
++          LC_GET_GROUP_INFO
++          LC_DENTRY_4ARGS
++          LC_HAVE_D_ALLOC_ANON
++          LC_COUNT_IN_STRUCT_FS_STRUCT
++          LC_BLKDEV_PUT_2ARGS
++          LC_OPEN_BDEV_MODE
++          LC_WRITE_BEGIN_IN_STRUCT_ADDRESS_SPACE_OPERATIONS
++
  ])
  
  #
-@@ -1606,6 +2125,7 @@
+@@ -1606,6 +2198,7 @@
          ],[
                  AC_MSG_RESULT([no]) 
          ])
@@ -896,7 +969,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 10:25:20.000000000 +0200
++++ lustre/lustre/include/liblustre.h  2009-08-20 12:12:43.000000000 +0200
 @@ -586,6 +586,52 @@
          int signal;
  };
@@ -961,7 +1034,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 
10:25:20.000000000 +0200
++++ lustre/lustre/include/linux/lustre_compat25.h      2009-08-20 
12:12:43.000000000 +0200
 @@ -44,8 +44,8 @@
  #endif
  
@@ -1120,7 +1193,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 10:25:20.000000000 
+0200
++++ lustre/lustre/include/linux/lustre_lib.h   2009-08-20 12:12:43.000000000 
+0200
 @@ -49,7 +49,6 @@
  # include <string.h>
  # include <sys/types.h>
@@ -1131,7 +1204,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 
10:25:20.000000000 +0200
++++ lustre/lustre/include/linux/lustre_patchless_compat.h      2009-08-20 
12:12:43.000000000 +0200
 @@ -52,7 +52,7 @@
  
          BUG_ON(!PageLocked(page));
@@ -1152,7 +1225,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 10:25:20.000000000 
+0200
++++ lustre/lustre/include/lprocfs_status.h     2009-08-20 12:12:43.000000000 
+0200
 @@ -521,6 +521,8 @@
  #define LPROCFS_EXIT()            do {  \
          up_read(&_lprocfs_lock);        \
@@ -1187,7 +1260,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 10:25:20.000000000 
+0200
++++ lustre/lustre/include/lustre/ll_fiemap.h   2009-08-20 12:12:43.000000000 
+0200
 @@ -86,7 +86,8 @@
  #define FIEMAP_EXTENT_UNKNOWN          0x00000002 /* Data location unknown. */
  #define FIEMAP_EXTENT_DELALLOC         0x00000004 /* Location still pending.
@@ -1261,7 +1334,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-08-19 09:51:09.000000000 
+0200
-+++ lustre/lustre/include/lustre_lite.h        2009-08-20 10:25:20.000000000 
+0200
++++ lustre/lustre/include/lustre_lite.h        2009-08-20 12:12:43.000000000 
+0200
 @@ -53,6 +53,13 @@
  #include <lustre_mds.h>
  #include <lustre_ha.h>
@@ -1278,7 +1351,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 10:25:20.000000000 +0200
++++ lustre/lustre/liblustre/lutil.c    2009-08-20 12:12:43.000000000 +0200
 @@ -176,7 +176,7 @@
  #define FAKE_ROOT_CAP 0x1ffffeff
  #define FAKE_USER_CAP 0
@@ -1297,7 +1370,18 @@ diff -urNad lustre~/lustre/liblustre/lutil.c 
lustre/lustre/liblustre/lutil.c
                  return 1;
  
          for (i = 0; i < current->ngroups; i++) {
-@@ -205,8 +205,8 @@
+@@ -202,43 +202,54 @@
+                 CERROR("Not enough memory\n");
+                 return -ENOMEM;
+         }
++#ifdef HAVE_CRED_IN_STRUCT_TASK_STRUCT
++      CRED(current) = malloc(sizeof(struct cred));
++      if (!CRED(current)) {
++              free(current);
++              CERROR("Not enough memory\n");
++              return -ENOMEM;
++      }
++#endif
  
          strncpy(current->comm, comm, sizeof(current->comm));
          current->pid = getpid();
@@ -1308,7 +1392,17 @@ diff -urNad lustre~/lustre/liblustre/lutil.c 
lustre/lustre/liblustre/lutil.c
          memset(&current->pending, 0, sizeof(current->pending));
  
          current->max_groups = sysconf(_SC_NGROUPS_MAX);
-@@ -221,24 +221,24 @@
+         current->groups = malloc(sizeof(gid_t) * current->max_groups);
+         if (!current->groups) {
++              free(current);          /* memory leak  -azi */
+                 CERROR("Not enough memory\n");
+                 return -ENOMEM;
+         }
+         current->ngroups = getgroups(current->max_groups, current->groups);
+         if (current->ngroups < 0) {
++              free(current->groups);  /* memory leak  -azi */
++              free(current);          /* memory leak  -azi */
+                 perror("Error getgroups");
                  return -EINVAL;
          }
  
@@ -1337,7 +1431,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 +253,12 @@
+@@ -253,12 +264,12 @@
  
  cfs_cap_t cfs_curproc_cap_pack(void) {
          cfs_cap_t cap;
@@ -1354,7 +1448,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 10:25:20.000000000 +0200
++++ lustre/lustre/liblustre/super.c    2009-08-20 12:12:43.000000000 +0200
 @@ -82,7 +82,7 @@
          struct intnl_stat *st = llu_i2stat(inode);
          mode_t mode = st->st_mode;
@@ -1408,7 +1502,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/dir.c  2009-08-20 12:12:43.000000000 +0200
 @@ -955,7 +955,7 @@
                                  GOTO(out_quotactl, rc = -EPERM);
                          break;
@@ -1419,8 +1513,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 10:25:20.000000000 +0200
-+++ lustre/lustre/llite/file.c 2009-08-20 10:25:20.000000000 +0200
+--- lustre~/lustre/llite/file.c        2009-08-20 12:12:42.000000000 +0200
++++ lustre/lustre/llite/file.c 2009-08-20 12:12:43.000000000 +0200
 @@ -1817,11 +1817,12 @@
  #endif
  }
@@ -1653,7 +1747,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-08-19 09:51:09.000000000 
+0200
-+++ lustre/lustre/llite/llite_internal.h       2009-08-20 10:25:20.000000000 
+0200
++++ lustre/lustre/llite/llite_internal.h       2009-08-20 12:12:43.000000000 
+0200
 @@ -596,8 +596,13 @@
  void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
  
@@ -1689,7 +1783,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/llite_lib.c    2009-08-20 12:12:43.000000000 +0200
 @@ -1346,7 +1346,7 @@
                  rc = vmtruncate(inode, new_size);
                  clear_bit(LLI_F_SRVLOCK, &lli->lli_flags);
@@ -1710,7 +1804,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/llite_mmap.c   2009-08-20 12:12:43.000000000 +0200
 @@ -81,8 +81,7 @@
  int lt_get_mmap_locks(struct ll_lock_tree *tree,
                        unsigned long addr, size_t count);
@@ -2010,7 +2104,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/llite_nfs.c    2009-08-20 12:12:43.000000000 +0200
 @@ -68,36 +68,30 @@
  }
  
@@ -2307,7 +2401,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/lloop.c        2009-08-20 12:12:43.000000000 +0200
 @@ -152,7 +152,7 @@
          struct semaphore   lo_bh_mutex;
          atomic_t           lo_pending;
@@ -2481,7 +2575,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/lproc_llite.c  2009-08-20 12:12:43.000000000 +0200
 @@ -649,7 +649,7 @@
                   sbi->ll_stats_track_id == current->p_pptr->pid)
                  lprocfs_counter_add(sbi->ll_stats, op, count);
@@ -2493,7 +2587,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/namei.c        2009-08-20 12:12:43.000000000 +0200
 @@ -875,7 +875,7 @@
                  GOTO(err_exit, err);
  
@@ -2505,7 +2599,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/rw.c   2009-08-20 12:12:43.000000000 +0200
 @@ -61,6 +61,8 @@
  
  #define DEBUG_SUBSYSTEM S_LLITE
@@ -2736,7 +2830,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw24.c 2009-08-20 10:25:20.000000000 +0200
++++ lustre/lustre/llite/rw24.c 2009-08-20 12:12:43.000000000 +0200
 @@ -150,8 +150,13 @@
          .readpage       = ll_readpage,
          .direct_IO      = ll_direct_IO_24,
@@ -2753,7 +2847,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-08-19 09:51:09.000000000 +0200
-+++ lustre/lustre/llite/rw26.c 2009-08-20 10:25:20.000000000 +0200
++++ lustre/lustre/llite/rw26.c 2009-08-20 12:12:43.000000000 +0200
 @@ -339,8 +339,13 @@
          .writepages     = generic_writepages,
          .set_page_dirty = __set_page_dirty_nobuffers,
@@ -2770,7 +2864,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 10:25:20.000000000 +0200
++++ lustre/lustre/llite/symlink.c      2009-08-20 12:12:43.000000000 +0200
 @@ -177,8 +177,12 @@
                  up(&lli->lli_size_sem);
          }
@@ -2786,7 +2880,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 10:25:20.000000000 
+0200
++++ lustre/lustre/lvfs/lustre_quota_fmt.c      2009-08-20 12:12:43.000000000 
+0200
 @@ -50,7 +50,12 @@
  #include <linux/init.h>
  #include <linux/module.h>
@@ -2803,7 +2897,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 
10:25:20.000000000 +0200
++++ lustre/lustre/lvfs/lustre_quota_fmt_convert.c      2009-08-20 
12:12:43.000000000 +0200
 @@ -50,7 +50,11 @@
  #include <linux/init.h>
  #include <linux/module.h>
@@ -2819,7 +2913,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 10:25:20.000000000 +0200
++++ lustre/lustre/lvfs/lvfs_linux.c    2009-08-20 12:12:43.000000000 +0200
 @@ -86,10 +86,19 @@
                  current_ngroups = 0;
          } else {
@@ -2946,7 +3040,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 10:25:20.000000000 +0200
++++ lustre/lustre/mdc/mdc_lib.c        2009-08-20 12:12:43.000000000 +0200
 @@ -56,8 +56,8 @@
          struct mds_body *b;
  
@@ -3037,7 +3131,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 10:25:21.000000000 +0200
++++ lustre/lustre/mgc/mgc_request.c    2009-08-20 12:12:43.000000000 +0200
 @@ -415,7 +415,7 @@
          obd->obd_lvfs_ctxt.fs = get_ds();
  
@@ -3049,7 +3143,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 
10:25:21.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-module.c        2009-08-20 
12:12:43.000000000 +0200
 @@ -204,7 +204,7 @@
          int err = 0;
          ENTRY;
@@ -3078,7 +3172,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 
10:25:21.000000000 +0200
++++ lustre/lustre/obdclass/linux/linux-sysctl.c        2009-08-20 
12:12:43.000000000 +0200
 @@ -56,7 +56,9 @@
  
  cfs_sysctl_table_header_t *obd_table_header = NULL;
@@ -3353,7 +3447,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 10:25:21.000000000 
+0200
++++ lustre/lustre/obdclass/lprocfs_status.c    2009-08-20 12:12:43.000000000 
+0200
 @@ -151,7 +151,7 @@
  
          LPROCFS_ENTRY();
@@ -3374,7 +3468,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 10:25:21.000000000 
+0200
++++ lustre/lustre/obdclass/lustre_handles.c    2009-08-20 12:12:43.000000000 
+0200
 @@ -56,6 +56,14 @@
  # define rcu_read_unlock()       spin_unlock(&bucket->lock)
  #endif /* ifndef HAVE_RCU */
@@ -3392,7 +3486,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-08-19 09:51:10.000000000 +0200
-+++ lustre/lustre/ptlrpc/service.c     2009-08-20 10:25:21.000000000 +0200
++++ lustre/lustre/ptlrpc/service.c     2009-08-20 12:12:43.000000000 +0200
 @@ -1497,11 +1497,17 @@
  {
          struct fs_struct *fs = current->fs;
@@ -3414,7 +3508,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 10:25:21.000000000 +0200
++++ lustre/lustre/ptlrpc/wiretest.c    2009-08-20 12:12:43.000000000 +0200
 @@ -2319,7 +2319,7 @@
          CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
          CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
@@ -3426,7 +3520,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 10:25:21.000000000 
+0200
++++ lustre/lustre/quota/quota_context.c        2009-08-20 12:12:43.000000000 
+0200
 @@ -240,7 +240,11 @@
          int ret = 0;
          ENTRY;
@@ -3489,7 +3583,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 10:25:21.000000000 
+0200
++++ lustre/lustre/quota/quota_interface.c      2009-08-20 12:12:43.000000000 
+0200
 @@ -149,7 +149,11 @@
  {
          ENTRY;
@@ -3528,7 +3622,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 10:25:21.000000000 
+0200
++++ lustre/lustre/quota/quota_internal.h       2009-08-20 12:12:43.000000000 
+0200
 @@ -41,6 +41,14 @@
  
  #ifdef HAVE_QUOTA_SUPPORT
@@ -3546,7 +3640,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 10:25:21.000000000 +0200
++++ lustre/lustre/utils/wiretest.c     2009-08-20 12:12:43.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

Reply via email to