From: Nathan Scott Date: Wed, 16 Nov 2005 14:11:31 +0000 (+0000) Subject: Fix build warnings on ia64 Linux and on IRIX too. X-Git-Tag: v2.8.0~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d026b19e895c621794f39f0ec20c09710e3a51c5;p=thirdparty%2Fxfsprogs-dev.git Fix build warnings on ia64 Linux and on IRIX too. Merge of master-melb:xfs-cmds:24460a by kenmcd. --- diff --git a/VERSION b/VERSION index 210c61461..0606b59a5 100644 --- a/VERSION +++ b/VERSION @@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=7 -PKG_REVISION=6 +PKG_REVISION=7 PKG_BUILD=1 diff --git a/debian/changelog b/debian/changelog index 64cc1f5bf..bd3466031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xfsprogs (2.7.6-1) unstable; urgency=low +xfsprogs (2.7.7-1) unstable; urgency=low * New upstream release. * Add support for (optional) ATTR2 format extension (closes: #336350) * Allow gcc -pedantic option for C++ users (closes: #249429) * Fix segv in xfs_db frag command (closes: #338207) - -- Nathan Scott Mon, 31 Oct 2005 08:49:46 +1100 + -- Nathan Scott Wed, 16 Nov 2005 16:32:35 +1100 xfsprogs (2.7.4-1) unstable; urgency=low diff --git a/doc/CHANGES b/doc/CHANGES index f99de74fd..54cacb134 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,8 @@ +xfsprogs-2.7.7 (16 November 2005) + - Fix some gcc compiler warnings on 64 bit platforms. + - Remove last reference to a (kernel) header. + - Updated aclocal.m4 + xfsprogs-2.7.6 (31 October 2005) - Add support for the inode extent size hint for the regular data device (previously was realtime only), and allow the diff --git a/include/linux.h b/include/linux.h index ace904384..fa6005098 100644 --- a/include/linux.h +++ b/include/linux.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index d392d212f..09f7fea7b 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -31,6 +31,18 @@ #include #include +typedef unsigned char __u8; +typedef signed char __s8; +typedef unsigned short __u16; +typedef signed short __s16; +typedef unsigned int __u32; +typedef signed int __s32; +typedef unsigned long long int __u64; +typedef signed long long int __s64; + +typedef __u16 __be16; +typedef __u32 __be32; +typedef __u64 __be64; #if defined(__linux__) #include @@ -38,13 +50,12 @@ #include #elif defined(__APPLE__) #include -#elif defined(__sgi__) || defined(___sgi) +#elif defined(__sgi__) || defined(__sgi) #include #else # error unknown platform... have fun porting! #endif - /* long and pointer must be either 32 bit or 64 bit */ #undef HAVE_32BIT_LONG #undef HAVE_64BIT_LONG @@ -119,9 +130,6 @@ typedef unsigned long long __psunsigned_t; #ifndef __user #define __user #endif -typedef __u16 __be16; -typedef __u32 __be32; -typedef __u64 __be64; #define IRIX_DEV_BITSMAJOR 14 #define IRIX_DEV_BITSMINOR 18 diff --git a/io/imap.c b/io/imap.c index 1128f0b64..458a1fd67 100644 --- a/io/imap.c +++ b/io/imap.c @@ -30,7 +30,7 @@ imap_f(int argc, char **argv) int count; int nent; int i; - __uint64_t last = 0; + __u64 last = 0; xfs_inogrp_t *t; xfs_fsop_bulkreq_t bulkreq; diff --git a/io/parent.c b/io/parent.c index 155660bdb..bc077a088 100644 --- a/io/parent.c +++ b/io/parent.c @@ -164,8 +164,8 @@ do_bulkstat(parent_t *parentbuf, xfs_bstat_t *bstatbuf, char *mntpt, int fsfd, jdm_fshandle_t *fshandlep) { int error; - int buflenout; - ino64_t lastino = 0; + __s32 buflenout; + __u64 lastino = 0; xfs_bstat_t *p; xfs_bstat_t *endp; xfs_fsop_bulkreq_t bulkreq; diff --git a/io/pread.c b/io/pread.c index 8816b3657..b93e27f53 100644 --- a/io/pread.c +++ b/io/pread.c @@ -266,7 +266,7 @@ pread_f( off64_t offset; unsigned int zeed = 0; long long count, total, tmp; - unsigned int fsblocksize, fssectsize; + size_t fsblocksize, fssectsize; struct timeval t1, t2; char s1[64], s2[64], ts[64]; char *sp; diff --git a/io/pwrite.c b/io/pwrite.c index 90c362083..595ba33c3 100644 --- a/io/pwrite.c +++ b/io/pwrite.c @@ -195,7 +195,7 @@ pwrite_f( off64_t offset, skip = 0; long long count, total, tmp; unsigned int zeed = 0, seed = 0xcdcdcdcd; - unsigned int fsblocksize, fssectsize; + size_t fsblocksize, fssectsize; struct timeval t1, t2; char s1[64], s2[64], ts[64]; char *sp, *infile = NULL; diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 4ebe4b0de..4248f9ef0 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -3239,14 +3239,16 @@ xfs_bmap_search_extents( ep = xfs_bmap_do_search_extents(base, lastx, nextents, bno, eofp, lastxp, gotp, prevp); - rt = ip->i_d.di_flags & XFS_DIFLAG_REALTIME; - if(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM)) { + rt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(ip); + if (unlikely(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM))) { cmn_err(CE_PANIC,"Access to block zero: fs: <%s> inode: %lld " "start_block : %llx start_off : %llx blkcnt : %llx " "extent-state : %x \n", - (ip->i_mount)->m_fsname,(long long)ip->i_ino, - gotp->br_startblock, gotp->br_startoff, - gotp->br_blockcount,gotp->br_state); + (ip->i_mount)->m_fsname, (long long)ip->i_ino, + (unsigned long long)gotp->br_startblock, + (unsigned long long)gotp->br_startoff, + (unsigned long long)gotp->br_blockcount, + gotp->br_state); } return ep; } diff --git a/quota/quot.c b/quota/quot.c index 00cae68b8..f970b640e 100644 --- a/quota/quot.c +++ b/quota/quot.c @@ -139,8 +139,8 @@ quot_bulkstat_mount( { xfs_fsop_bulkreq_t bulkreq; xfs_bstat_t *buf; - __uint64_t last = 0; - __int32_t count; + __u64 last = 0; + __s32 count; int i, sts, fsfd; du_t **dp;