[Pkg-lustre-svn-commit] updated: [fb2b913] Add typecasts in lustre/mds/handler.c as also the kernel module is

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit fb2b9135d5b9168050b0e86b38fae43473145f9b
Author: Patrick Winnertz <winnie at debian.org>
Date:   Thu Aug 13 11:59:52 2009 +0200

    Add typecasts in lustre/mds/handler.c as also the kernel module is
    now compiled with -Werror
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/fix_typecasts_in_printf.dpatch b/debian/patches/fix_typecasts_in_printf.dpatch
index a635aee..0dd4f47 100755
--- a/debian/patches/fix_typecasts_in_printf.dpatch
+++ b/debian/patches/fix_typecasts_in_printf.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad lustre~/lustre/liblustre/tests/recovery_small.c lustre/lustre/liblustre/tests/recovery_small.c
---- lustre~/lustre/liblustre/tests/recovery_small.c	2009-08-12 15:02:38.000000000 +0200
-+++ lustre/lustre/liblustre/tests/recovery_small.c	2009-08-12 15:03:27.000000000 +0200
+--- lustre~/lustre/liblustre/tests/recovery_small.c	2009-08-13 11:31:21.000000000 +0200
++++ lustre/lustre/liblustre/tests/recovery_small.c	2009-08-13 12:33:42.000000000 +0200
 @@ -142,7 +142,7 @@
  #define FAIL()                                                             \
      do {                                                                   \
@@ -18,8 +18,8 @@ diff -urNad lustre~/lustre/liblustre/tests/recovery_small.c lustre/lustre/liblus
          if (drop_arr[drop_index].name) {                                   \
              printf("server drops next %s\n", drop_arr[drop_index].name);   \
 diff -urNad lustre~/lustre/liblustre/tests/sanity.c lustre/lustre/liblustre/tests/sanity.c
---- lustre~/lustre/liblustre/tests/sanity.c	2009-08-12 14:51:47.000000000 +0200
-+++ lustre/lustre/liblustre/tests/sanity.c	2009-08-12 15:02:51.000000000 +0200
+--- lustre~/lustre/liblustre/tests/sanity.c	2009-08-13 11:31:21.000000000 +0200
++++ lustre/lustre/liblustre/tests/sanity.c	2009-08-13 12:33:42.000000000 +0200
 @@ -576,7 +576,7 @@
                  return(1);
          }
@@ -144,3 +144,23 @@ diff -urNad lustre~/lustre/liblustre/tests/sanity.c lustre/lustre/liblustre/test
                  t_close(fd);
                  return -1;
          }
+diff -urNad lustre~/lustre/mds/handler.c lustre/lustre/mds/handler.c
+--- lustre~/lustre/mds/handler.c	2009-08-13 12:33:40.000000000 +0200
++++ lustre/lustre/mds/handler.c	2009-08-13 12:34:58.000000000 +0200
+@@ -1281,14 +1281,14 @@
+         blksize = de->d_inode->i_sb->s_blocksize;
+         /* body->size is actually the offset -eeb */
+         if ((body->size & (blksize - 1)) != 0) {
+-                CERROR("offset "LPU64" not on a block boundary of %lu\n",
++                CERROR("offset "LPU64" not on a block boundary of %i\n",
+                        body->size, blksize);
+                 GOTO(out_file, rc = -EFAULT);
+         }
+ 
+         /* body->nlink is actually the #bytes to read -eeb */
+         if (body->nlink & (blksize - 1)) {
+-                CERROR("size %u is not multiple of blocksize %lu\n",
++                CERROR("size %u is not multiple of blocksize %i\n",
+                        body->nlink, blksize);
+                 GOTO(out_file, rc = -EFAULT);
+         }

-- 
Lustre Debian Packaging