[Pkg-lustre-svn-commit] updated: [3474fbb] Fix several more typecasts while building 2.6.26
Patrick Winnertz
winnie at debian.org
Mon Mar 8 13:54:16 UTC 2010
The following commit has been merged in the master branch:
commit 3474fbb88d3fc6eb2a371bc5ed045e364cbc7e48
Author: Patrick Winnertz <winnie at debian.org>
Date: Mon Mar 8 14:53:36 2010 +0100
Fix several more typecasts while building 2.6.26
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 028f24c..d6a8e52 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
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
++++ lustre/aclocal.m4 2010-03-08 14:46:11.185807558 +0100
@@ -1681,7 +1681,7 @@
AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
[AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block])
@@ -136,7 +136,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
am_cv_$1_dependencies_compiler_type=$depmode
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
++++ lustre/ldiskfs/aclocal.m4 2010-03-08 14:46:11.185807558 +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
@@ -148,7 +148,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
am_cv_$1_dependencies_compiler_type=$depmode
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
++++ lustre/libsysio/aclocal.m4 2010-03-08 14:46:11.189782924 +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
@@ -160,7 +160,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# icc: Command line warning: ignoring option '-M'; no argument required
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
++++ lustre/libsysio/configure.in 2010-03-08 14:46:11.189782924 +0100
@@ -362,7 +362,7 @@
AC_MSG_CHECKING(for POSIX 2008 preadv)
@@ -181,7 +181,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
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
++++ lustre/lnet/autoconf/lustre-lnet.m4 2010-03-08 14:46:11.189782924 +0100
@@ -1073,7 +1073,7 @@
AC_DEFUN([LN_KERN__U64_LONG_LONG],
[AC_MSG_CHECKING([kernel __u64 is long long type])
@@ -246,8 +246,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
#include <linux/sched.h>
#include <linux/fs_struct.h>
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
+--- lustre~/lustre/autoconf/lustre-core.m4 2010-03-08 14:46:10.350777829 +0100
++++ lustre/lustre/autoconf/lustre-core.m4 2010-03-08 14:46:11.193781476 +0100
@@ -651,7 +651,7 @@
AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
[AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block])
@@ -303,8 +303,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# 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
+--- lustre~/lustre/llite/file.c 2010-03-08 14:46:09.957780614 +0100
++++ lustre/lustre/llite/file.c 2010-03-08 14:46:11.193781476 +0100
@@ -1428,7 +1428,7 @@
count = ll_file_get_iov_count(iov, &nr_segs);
@@ -359,3 +359,29 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
ll_ra_read_init(in_file, &bead, *ppos, count);
/* BUG: 5972 */
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/llite/rw26.c lustre/lustre/llite/rw26.c
+--- lustre~/lustre/llite/rw26.c 2010-03-03 14:44:38.000000000 +0100
++++ lustre/lustre/llite/rw26.c 2010-03-08 14:46:11.197810200 +0100
+@@ -242,8 +242,8 @@
+
+ CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), size="LPSZ" (max %lu), "
+ "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,
+ MAX_DIO_SIZE >> CFS_PAGE_SHIFT);
+
+ if (rw == WRITE)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/obdclass/obd_mount.c lustre/lustre/obdclass/obd_mount.c
+--- lustre~/lustre/obdclass/obd_mount.c 2010-03-03 14:44:38.000000000 +0100
++++ lustre/lustre/obdclass/obd_mount.c 2010-03-08 14:49:23.129781518 +0100
+@@ -279,7 +279,7 @@
+ CDEBUG(D_MOUNT, "Have %s, size %lu\n", MOUNT_DATA_FILE, len);
+ 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));
+ GOTO(out_close, rc = -EINVAL);
+ }
+
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list