[Pkg-lustre-svn-commit] updated: [682f0da] fix typecast: long unsigned int is needed here, not unsigned int

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 682f0da29f16c2a28f8468a931e5768c4fe3c143
Author: Patrick Winnertz <winnie at debian.org>
Date:   Tue Mar 9 12:46:56 2010 +0100

    fix typecast: long unsigned int is needed here, not unsigned int
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/no-strict-aliasing.dpatch b/debian/patches/no-strict-aliasing.dpatch
index d6a8e52..7496226 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -310,7 +310,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
          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);
++               inode->i_ino, inode->i_generation, inode, (long unsigned int)count, *ppos);
          /* "If nbyte is 0, read() will return 0 and have no other results."
           *                      -- Single Unix Spec */
          if (count == 0)
@@ -319,7 +319,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
          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));
++               inode->i_ino, (long unsigned int)chunk, *ppos, i_size_read(inode));
  
          /* turn off the kernel's read-ahead */
          if (ltd.lock_style != LL_LOCK_STYLE_NOLOCK) {
@@ -328,7 +328,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
          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);
++               inode->i_ino, inode->i_generation, inode, (long unsigned int)count, *ppos);
  
          SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
  
@@ -337,7 +337,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
          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);
++               inode->i_ino, (long unsigned int)chunk, *ppos);
          if (tree_locked) {
                  struct ost_lvb *xtimes;
                  /* write under locks
@@ -346,7 +346,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
          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);
++               inode->i_ino, inode->i_generation, inode, (long unsigned int)count, *ppos);
  
          /* "If nbyte is 0, read() will return 0 and have no other results."
           *                      -- Single Unix Spec */
@@ -355,7 +355,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
          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));
++               inode->i_ino, (long unsigned int)count, *ppos, i_size_read(inode));
  
          ll_ra_read_init(in_file, &bead, *ppos, count);
          /* BUG: 5972 */
@@ -368,8 +368,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
                 "offset=%lld=%llx, pages "LPSZ" (max %lu)\n",
 -               inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
 -               file_offset, file_offset, count >> CFS_PAGE_SHIFT,
-+               inode->i_ino, inode->i_generation, inode, (unsigned int)count, MAX_DIO_SIZE,
-+               file_offset, file_offset, (unsigned int)count >> CFS_PAGE_SHIFT,
++               inode->i_ino, inode->i_generation, inode, (long unsigned int)count, MAX_DIO_SIZE,
++               file_offset, file_offset, (long unsigned int)count >> CFS_PAGE_SHIFT,
                 MAX_DIO_SIZE >> CFS_PAGE_SHIFT);
  
          if (rw == WRITE)
@@ -381,7 +381,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
          if (len != sizeof(*ldd)) {
                  CERROR("disk data size does not match: see %lu expect "LPSZ"\n",
 -                       len, sizeof(*ldd));
-+                       (long unsigned int)len, (unsigned int)sizeof(*ldd));
++                       (long unsigned int)len, (long unsigned int)sizeof(*ldd));
                  GOTO(out_close, rc = -EINVAL);
          }
  

-- 
Lustre Debian Packaging