[Pkg-lustre-svn-commit] updated: [6495e4a] Added another fix for a compiler warning Signed-off-by: Patrick Winnertz <winnie at debian.org>
Patrick Winnertz
winnie at debian.org
Thu Mar 18 15:52:42 UTC 2010
The following commit has been merged in the master branch:
commit 6495e4a09955ed3e48803bfd7e4e37b26aac9758
Author: Patrick Winnertz <winnie at debian.org>
Date: Thu Mar 18 11:49:21 2010 +0100
Added another fix for a compiler warning
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 7496226..4b88af0 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -6,8 +6,8 @@
@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 14:46:11.185807558 +0100
+--- lustre~/aclocal.m4 2010-03-11 13:05:55.000000000 +0100
++++ lustre/aclocal.m4 2010-03-18 16:07:40.643923983 +0100
@@ -1681,7 +1681,7 @@
AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
[AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block])
@@ -135,8 +135,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
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 14:46:11.185807558 +0100
+--- lustre~/ldiskfs/aclocal.m4 2010-03-11 13:05:55.000000000 +0100
++++ lustre/ldiskfs/aclocal.m4 2010-03-18 16:07:40.643923983 +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
@@ -147,8 +147,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
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 14:46:11.189782924 +0100
+--- lustre~/libsysio/aclocal.m4 2010-03-11 13:05:55.000000000 +0100
++++ lustre/libsysio/aclocal.m4 2010-03-18 16:07:40.643923983 +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
@@ -159,8 +159,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
# When given -MP, icc 7.0 and 7.1 complain thusly:
# 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 14:46:11.189782924 +0100
+--- lustre~/libsysio/configure.in 2010-03-11 13:05:55.000000000 +0100
++++ lustre/libsysio/configure.in 2010-03-18 16:07:40.643923983 +0100
@@ -362,7 +362,7 @@
AC_MSG_CHECKING(for POSIX 2008 preadv)
@@ -180,8 +180,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
#define _BSD_SOURCE
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 14:46:11.189782924 +0100
+--- lustre~/lnet/autoconf/lustre-lnet.m4 2010-03-11 13:05:55.000000000 +0100
++++ lustre/lnet/autoconf/lustre-lnet.m4 2010-03-18 16:07:40.643923983 +0100
@@ -1073,7 +1073,7 @@
AC_DEFUN([LN_KERN__U64_LONG_LONG],
[AC_MSG_CHECKING([kernel __u64 is long long type])
@@ -246,14 +246,14 @@ 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 14:46:10.350777829 +0100
-+++ lustre/lustre/autoconf/lustre-core.m4 2010-03-08 14:46:11.193781476 +0100
+--- lustre~/lustre/autoconf/lustre-core.m4 2010-03-18 16:07:40.306949034 +0100
++++ lustre/lustre/autoconf/lustre-core.m4 2010-03-18 16:08:16.999988662 +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"
-EXTRA_KCFLAGS="-Werror"
-+EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
++EXTRA_KCFLAGS="Werror -fno-strict-aliasing"
LB_LINUX_TRY_COMPILE([
#include <linux/fs.h>
@@ -293,24 +293,28 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
LB_LINUX_TRY_COMPILE([
#include <linux/fs.h>
],[
-@@ -2217,7 +2217,7 @@
+@@ -2216,9 +2216,9 @@
+ AC_DEFUN([LC_CONFIGURE],
[LC_CONFIG_OBD_BUFFER_SIZE
- if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
+-if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
- CFLAGS="$CFLAGS -Werror"
-+ CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
- fi
+-fi
++#if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
++# CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
++#fi
# include/liblustre.h
+ AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.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 14:46:09.957780614 +0100
-+++ lustre/lustre/llite/file.c 2010-03-08 14:46:11.193781476 +0100
+--- lustre~/lustre/llite/file.c 2010-03-18 16:07:40.254924124 +0100
++++ lustre/lustre/llite/file.c 2010-03-18 16:07:40.651923533 +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, (long unsigned int)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)
@@ -319,7 +323,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, (long unsigned int)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) {
@@ -328,7 +332,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, (long unsigned int)count, *ppos);
++ inode->i_ino, inode->i_generation, inode, (unsigned int)count, *ppos);
SIGNAL_MASK_ASSERT(); /* XXX BUG 1511 */
@@ -337,7 +341,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, (long unsigned int)chunk, *ppos);
++ inode->i_ino, (unsigned int)chunk, *ppos);
if (tree_locked) {
struct ost_lvb *xtimes;
/* write under locks
@@ -346,7 +350,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, (long unsigned int)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 */
@@ -355,33 +359,77 @@ 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, (long unsigned int)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 -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
+--- lustre~/lustre/llite/rw26.c 2010-03-11 13:05:55.000000000 +0100
++++ lustre/lustre/llite/rw26.c 2010-03-18 16:07:40.651923533 +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, (long unsigned int)count, MAX_DIO_SIZE,
-+ file_offset, file_offset, (long unsigned int)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/lvfs/fsfilt_ext3.c lustre/lustre/lvfs/fsfilt_ext3.c
+--- lustre~/lustre/lvfs/fsfilt_ext3.c 2010-03-03 14:44:38.000000000 +0100
++++ lustre/lustre/lvfs/fsfilt_ext3.c 2010-03-18 16:07:40.655924251 +0100
+@@ -721,7 +721,7 @@
+ const int blksize = inode->i_sb->s_blocksize;
+
+ CDEBUG(D_EXT2, "reading "LPSZ" at dir %lu+%llu\n",
+- count, inode->i_ino, *off);
++ (unsigned int)count, inode->i_ino, *off);
+ while (count > 0) {
+ struct buffer_head *bh;
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/mds/handler.c lustre/lustre/mds/handler.c
+--- lustre~/lustre/mds/handler.c 2010-03-18 16:07:40.206923818 +0100
++++ lustre/lustre/mds/handler.c 2010-03-18 16:07:40.655924251 +0100
+@@ -1240,14 +1240,14 @@
+ /* body->size is actually the offset -eeb */
+ if ((body->size & (blksize - 1)) != 0) {
+ CERROR("offset "LPU64" not on a block boundary of %lu\n",
+- body->size, blksize);
++ body->size, (long unsigned int)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",
+- body->nlink, blksize);
++ body->nlink, (long unsigned int)blksize);
+ GOTO(out_file, rc = -EFAULT);
+ }
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/mds/mds_join.c lustre/lustre/mds/mds_join.c
+--- lustre~/lustre/mds/mds_join.c 2010-01-23 03:07:58.000000000 +0100
++++ lustre/lustre/mds/mds_join.c 2010-03-18 16:07:40.655924251 +0100
+@@ -241,7 +241,7 @@
+ int max_easize = sizeof(*lmmj);
+
+ CDEBUG(D_INFO, "change the max md size from %d to "LPSZ"\n",
+- mds->mds_max_mdsize, sizeof(*lmmj));
++ mds->mds_max_mdsize, (unsigned int)sizeof(*lmmj));
+
+ if (mds->mds_max_mdsize < max_easize ||
+ mds->mds_max_cookiesize < max_cookiesize) {
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
+--- lustre~/lustre/obdclass/obd_mount.c 2010-03-11 13:05:55.000000000 +0100
++++ lustre/lustre/obdclass/obd_mount.c 2010-03-18 16:07:40.659923781 +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, (long unsigned int)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