The following commit has been merged in the master branch:
commit d4fca9f32e136d8a3f847eaf986c068b3c6ee485
Author: Patrick Winnertz <win...@debian.org>
Date:   Mon Mar 8 12:25:35 2010 +0100

    Fix two build failures of the kernel module on 2.6.26
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
index ff8bd8f..028f24c 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -5,11 +5,10 @@
 ## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile 
with gcc-4.4
 
 @DPATCH@
-diff --git a/aclocal.m4 b/aclocal.m4
-index bf2b8cd..7f3a4ef 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1681,7 +1681,7 @@ LB_LINUX_TRY_COMPILE([
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/aclocal.m4 lustre/aclocal.m4
+--- lustre~/aclocal.m4 2010-03-08 10:46:38.000000000 +0100
++++ lustre/aclocal.m4  2010-03-08 12:16:01.485811761 +0100
+@@ -1681,7 +1681,7 @@
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -18,7 +17,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  
-@@ -1746,7 +1746,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1746,7 +1746,7 @@
  AC_DEFUN([LC_VFS_READDIR_U64_INO],
  [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -27,7 +26,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
  #include <linux/fs.h>
        int fillonedir(void * __buf, const char * name, int namlen, loff_t 
offset,
-@@ -2086,7 +2086,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -2086,7 +2086,7 @@
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -36,7 +35,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
          #include <linux/fs.h>
  ],[
-@@ -2214,7 +2214,7 @@ AC_DEFUN([LC_REGISTER_SHRINKER],
+@@ -2214,7 +2214,7 @@
  ],[
          AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
          tmp_flags="$EXTRA_KCFLAGS"
@@ -45,7 +44,7 @@ index bf2b8cd..7f3a4ef 100644
          LB_LINUX_TRY_COMPILE([
                  #include <linux/mm.h>
          ],[
-@@ -2454,7 +2454,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -2454,7 +2454,7 @@
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -54,7 +53,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  ],[
-@@ -3246,7 +3246,7 @@ AC_DEFUN([LC_CONFIGURE],
+@@ -3246,7 +3246,7 @@
  [LC_CONFIG_OBD_BUFFER_SIZE
  
  if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
@@ -63,7 +62,7 @@ index bf2b8cd..7f3a4ef 100644
  fi
  
  # include/liblustre.h
-@@ -5093,7 +5093,7 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported])
+@@ -5093,7 +5093,7 @@
  AC_DEFUN([LN_KERN__U64_LONG_LONG],
  [AC_MSG_CHECKING([kernel __u64 is long long type])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -72,7 +71,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5116,7 +5116,7 @@ EXTRA_KCFLAGS="$tmp_flags"
+@@ -5116,7 +5116,7 @@
  AC_DEFUN([LN_USER__U64_LONG_LONG],
  [AC_MSG_CHECKING([userspace __u64 is long long type])
  tmp_flags="$CFLAGS"
@@ -81,7 +80,7 @@ index bf2b8cd..7f3a4ef 100644
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5141,7 +5141,7 @@ CFLAGS="$tmp_flags"
+@@ -5141,7 +5141,7 @@
  AC_DEFUN([LN_SIZE_T_LONG],
  [AC_MSG_CHECKING([size_t is unsigned long type])
  tmp_flags="$CFLAGS"
@@ -90,7 +89,7 @@ index bf2b8cd..7f3a4ef 100644
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5165,7 +5165,7 @@ CFLAGS="$tmp_flags"
+@@ -5165,7 +5165,7 @@
  AC_DEFUN([LN_SSIZE_T_LONG],
  [AC_MSG_CHECKING([ssize_t is signed long type])
  tmp_flags="$CFLAGS"
@@ -99,7 +98,7 @@ index bf2b8cd..7f3a4ef 100644
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5312,7 +5312,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -5312,7 +5312,7 @@
  AC_DEFUN([LN_KMEM_CACHE],
  [AC_MSG_CHECKING([check kernel has struct kmem_cache])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -108,7 +107,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
          #include <linux/slab.h>
          typedef struct kmem_cache cache_t;
-@@ -5356,7 +5356,7 @@ AC_DEFUN([LN_FUNC_DUMP_TRACE],
+@@ -5356,7 +5356,7 @@
  [LB_CHECK_SYMBOL_EXPORT([dump_trace],
  [kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
        tmp_flags="$EXTRA_KCFLAGS"
@@ -117,7 +116,7 @@ index bf2b8cd..7f3a4ef 100644
        AC_MSG_CHECKING([whether we can really use dump_trace])
        LB_LINUX_TRY_COMPILE([
                struct task_struct;
-@@ -5510,7 +5510,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -5510,7 +5510,7 @@
  AC_DEFUN([LN_FUNC_UNSHARE_FS_STRUCT],
  [AC_MSG_CHECKING([if kernel defines unshare_fs_struct()])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -126,7 +125,7 @@ index bf2b8cd..7f3a4ef 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/sched.h>
        #include <linux/fs_struct.h>
-@@ -6705,7 +6705,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+@@ -6705,7 +6705,7 @@
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -135,13 +134,10 @@ index bf2b8cd..7f3a4ef 100644
        # that says an option was ignored.
        if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
          am_cv_$1_dependencies_compiler_type=$depmode
-diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
-index 14df659..6fabe2e 100755
-diff --git a/ldiskfs/aclocal.m4 b/ldiskfs/aclocal.m4
-index 9df75ae..e1a20c5 100644
---- a/ldiskfs/aclocal.m4
-+++ b/ldiskfs/aclocal.m4
-@@ -596,7 +596,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/aclocal.m4 lustre/ldiskfs/aclocal.m4
+--- lustre~/ldiskfs/aclocal.m4 2010-03-08 10:46:38.000000000 +0100
++++ lustre/ldiskfs/aclocal.m4  2010-03-08 12:16:01.489789083 +0100
+@@ -596,7 +596,7 @@
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -150,11 +146,10 @@ index 9df75ae..e1a20c5 100644
        # that says an option was ignored.
        if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
          am_cv_$1_dependencies_compiler_type=$depmode
-diff --git a/libsysio/aclocal.m4 b/libsysio/aclocal.m4
-index fd273ba..b236478 100644
---- a/libsysio/aclocal.m4
-+++ b/libsysio/aclocal.m4
-@@ -221,7 +221,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/aclocal.m4 lustre/libsysio/aclocal.m4
+--- lustre~/libsysio/aclocal.m4        2010-03-08 10:46:38.000000000 +0100
++++ lustre/libsysio/aclocal.m4 2010-03-08 12:16:01.493779464 +0100
+@@ -221,7 +221,7 @@
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -163,11 +158,10 @@ index fd273ba..b236478 100644
        # that says an option was ignored or not supported.
        # When given -MP, icc 7.0 and 7.1 complain thusly:
        #   icc: Command line warning: ignoring option '-M'; no argument 
required
-diff --git a/libsysio/configure.in b/libsysio/configure.in
-index 5ce600f..af030bc 100644
---- a/libsysio/configure.in
-+++ b/libsysio/configure.in
-@@ -362,7 +362,7 @@ fi
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/configure.in lustre/libsysio/configure.in
+--- lustre~/libsysio/configure.in      2010-03-08 10:46:38.000000000 +0100
++++ lustre/libsysio/configure.in       2010-03-08 12:16:01.493779464 +0100
+@@ -362,7 +362,7 @@
  
  AC_MSG_CHECKING(for POSIX 2008 preadv)
  tmp_flags="$CFLAGS"
@@ -176,7 +170,7 @@ index 5ce600f..af030bc 100644
  AC_TRY_COMPILE([
  #include <sys/uio.h>
  ssize_t preadv (int __fd, const struct iovec *__iovec,
-@@ -381,7 +381,7 @@ CFLAGS="$tmp_flags"
+@@ -381,7 +381,7 @@
  
  AC_MSG_CHECKING(for POSIX 2008 scandir)
  tmp_flags="$CFLAGS"
@@ -185,11 +179,10 @@ index 5ce600f..af030bc 100644
  AC_TRY_COMPILE([
  #define _BSD_SOURCE
  
-diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
-index 6297224..0575e72 100644
---- a/lnet/autoconf/lustre-lnet.m4
-+++ b/lnet/autoconf/lustre-lnet.m4
-@@ -1073,7 +1073,7 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported])
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
+--- lustre~/lnet/autoconf/lustre-lnet.m4       2010-03-08 10:46:38.000000000 
+0100
++++ lustre/lnet/autoconf/lustre-lnet.m4        2010-03-08 12:16:01.497779902 
+0100
+@@ -1073,7 +1073,7 @@
  AC_DEFUN([LN_KERN__U64_LONG_LONG],
  [AC_MSG_CHECKING([kernel __u64 is long long type])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -198,7 +191,7 @@ index 6297224..0575e72 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1096,7 +1096,7 @@ EXTRA_KCFLAGS="$tmp_flags"
+@@ -1096,7 +1096,7 @@
  AC_DEFUN([LN_USER__U64_LONG_LONG],
  [AC_MSG_CHECKING([userspace __u64 is long long type])
  tmp_flags="$CFLAGS"
@@ -207,7 +200,7 @@ index 6297224..0575e72 100644
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1121,7 +1121,7 @@ CFLAGS="$tmp_flags"
+@@ -1121,7 +1121,7 @@
  AC_DEFUN([LN_SIZE_T_LONG],
  [AC_MSG_CHECKING([size_t is unsigned long type])
  tmp_flags="$CFLAGS"
@@ -216,7 +209,7 @@ index 6297224..0575e72 100644
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1145,7 +1145,7 @@ CFLAGS="$tmp_flags"
+@@ -1145,7 +1145,7 @@
  AC_DEFUN([LN_SSIZE_T_LONG],
  [AC_MSG_CHECKING([ssize_t is signed long type])
  tmp_flags="$CFLAGS"
@@ -225,7 +218,7 @@ index 6297224..0575e72 100644
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1292,7 +1292,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1292,7 +1292,7 @@
  AC_DEFUN([LN_KMEM_CACHE],
  [AC_MSG_CHECKING([check kernel has struct kmem_cache])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -234,7 +227,7 @@ index 6297224..0575e72 100644
  LB_LINUX_TRY_COMPILE([
          #include <linux/slab.h>
          typedef struct kmem_cache cache_t;
-@@ -1336,7 +1336,7 @@ AC_DEFUN([LN_FUNC_DUMP_TRACE],
+@@ -1336,7 +1336,7 @@
  [LB_CHECK_SYMBOL_EXPORT([dump_trace],
  [kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
        tmp_flags="$EXTRA_KCFLAGS"
@@ -243,7 +236,7 @@ index 6297224..0575e72 100644
        AC_MSG_CHECKING([whether we can really use dump_trace])
        LB_LINUX_TRY_COMPILE([
                struct task_struct;
-@@ -1490,7 +1490,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1490,7 +1490,7 @@
  AC_DEFUN([LN_FUNC_UNSHARE_FS_STRUCT],
  [AC_MSG_CHECKING([if kernel defines unshare_fs_struct()])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -252,11 +245,10 @@ index 6297224..0575e72 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/sched.h>
        #include <linux/fs_struct.h>
-diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index d01d8e0..db1a665 100644
---- a/lustre/autoconf/lustre-core.m4
-+++ b/lustre/autoconf/lustre-core.m4
-@@ -651,7 +651,7 @@ LB_LINUX_TRY_COMPILE([
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
+--- lustre~/lustre/autoconf/lustre-core.m4     2010-03-08 12:16:00.614780031 
+0100
++++ lustre/lustre/autoconf/lustre-core.m4      2010-03-08 12:16:01.497779902 
+0100
+@@ -651,7 +651,7 @@
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -265,7 +257,7 @@ index d01d8e0..db1a665 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  
-@@ -716,7 +716,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -716,7 +716,7 @@
  AC_DEFUN([LC_VFS_READDIR_U64_INO],
  [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -274,7 +266,7 @@ index d01d8e0..db1a665 100644
  LB_LINUX_TRY_COMPILE([
  #include <linux/fs.h>
        int fillonedir(void * __buf, const char * name, int namlen, loff_t 
offset,
-@@ -1056,7 +1056,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1056,7 +1056,7 @@
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -283,7 +275,7 @@ index d01d8e0..db1a665 100644
  LB_LINUX_TRY_COMPILE([
          #include <linux/fs.h>
  ],[
-@@ -1184,7 +1184,7 @@ AC_DEFUN([LC_REGISTER_SHRINKER],
+@@ -1184,7 +1184,7 @@
  ],[
          AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
          tmp_flags="$EXTRA_KCFLAGS"
@@ -292,7 +284,7 @@ index d01d8e0..db1a665 100644
          LB_LINUX_TRY_COMPILE([
                  #include <linux/mm.h>
          ],[
-@@ -1424,7 +1424,7 @@ LB_LINUX_TRY_COMPILE([
+@@ -1424,7 +1424,7 @@
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -301,7 +293,7 @@ index d01d8e0..db1a665 100644
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  ],[
-@@ -2216,7 +2216,7 @@ AC_DEFUN([LC_CONFIGURE],
+@@ -2217,7 +2217,7 @@
  [LC_CONFIG_OBD_BUFFER_SIZE
  
  if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
@@ -310,3 +302,60 @@ index d01d8e0..db1a665 100644
  fi
  
  # include/liblustre.h
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
+--- lustre~/lustre/llite/file.c        2010-03-08 12:16:00.394780982 +0100
++++ lustre/lustre/llite/file.c 2010-03-08 12:22:37.309788940 +0100
+@@ -1428,7 +1428,7 @@
+ 
+         count = ll_file_get_iov_count(iov, &nr_segs);
+         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
+-               inode->i_ino, inode->i_generation, inode, count, *ppos);
++               inode->i_ino, inode->i_generation, inode, (unsigned int)count, 
*ppos);
+         /* "If nbyte is 0, read() will return 0 and have no other results."
+          *                      -- Single Unix Spec */
+         if (count == 0)
+@@ -1598,7 +1598,7 @@
+ 
+         chunk = end - *ppos + 1;
+         CDEBUG(D_INODE,"Read ino %lu, "LPSZ" bytes, offset %lld, i_size 
%llu\n",
+-               inode->i_ino, chunk, *ppos, i_size_read(inode));
++               inode->i_ino, (unsigned int)chunk, *ppos, i_size_read(inode));
+ 
+         /* turn off the kernel's read-ahead */
+         if (ltd.lock_style != LL_LOCK_STYLE_NOLOCK) {
+@@ -1778,7 +1778,7 @@
+         count = ll_file_get_iov_count(iov, &nr_segs);
+ 
+         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
+-               inode->i_ino, inode->i_generation, inode, count, *ppos);
++               inode->i_ino, inode->i_generation, inode, (unsigned int)count, 
*ppos);
+ 
+         SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
+ 
+@@ -1881,7 +1881,7 @@
+         /* generic_file_write handles O_APPEND after getting i_mutex */
+         chunk = end - *ppos + 1;
+         CDEBUG(D_INFO, "Writing inode %lu, "LPSZ" bytes, offset %Lu\n",
+-               inode->i_ino, chunk, *ppos);
++               inode->i_ino, (unsigned int)chunk, *ppos);
+         if (tree_locked) {
+                 struct ost_lvb *xtimes;
+                 /* write under locks
+@@ -2116,7 +2116,7 @@
+         ENTRY;
+ 
+         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),size="LPSZ",offset=%Ld\n",
+-               inode->i_ino, inode->i_generation, inode, count, *ppos);
++               inode->i_ino, inode->i_generation, inode, (unsigned int)count, 
*ppos);
+ 
+         /* "If nbyte is 0, read() will return 0 and have no other results."
+          *                      -- Single Unix Spec */
+@@ -2181,7 +2181,7 @@
+         }
+ 
+         CDEBUG(D_INFO, "Send ino %lu, "LPSZ" bytes, offset %lld, i_size 
%llu\n",
+-               inode->i_ino, count, *ppos, i_size_read(inode));
++               inode->i_ino, (unsigned int)count, *ppos, i_size_read(inode));
+ 
+         ll_ra_read_init(in_file, &bead, *ppos, count);
+         /* BUG: 5972 */
diff --git a/debian/rules b/debian/rules
index 9b4442f..2643734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -267,7 +267,6 @@ kdist_config: prep-deb-files
        find . -type f -exec touch -r COPYING {} \;
        # Doesn't seem possible to only build modules...
         ./configure --with-linux=$(KSRC) \
-       #               --with-o2ib=$(KSRC) \
                    --disable-quilt  \
                    --disable-dependency-tracking \
                    --disable-doc  \

-- 
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