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 210c61461cbcde34fc913af6090fd6b84540c8b4..0606b59a5273701e553a81a59f6f72c255c906c6 100644 (file)
--- 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 64cc1f5bfc007cb4437b560fccd17d3d4ee95c46..bd34660312397dcc476a58ed26dd4e2b74d177e8 100644 (file)
--- 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++ <xfs.h> users (closes: #249429)
   * Fix segv in xfs_db frag command (closes: #338207)
 
- -- Nathan Scott <nathans@debian.org>  Mon, 31 Oct 2005 08:49:46 +1100
+ -- Nathan Scott <nathans@debian.org>  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 f99de74fdc53be6d906dd47c6b650e46283da4d6..54cacb13474701b63e8884ddefd4143ebc7ffb8d 100644 (file)
--- 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 <linux/*.h> (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 ace90438446d6c0d693daecefe8d2c6702451edb..fa60050986bf88251a3a5d1875fb75f5078ccf9a 100644 (file)
--- a/include/linux.h
+++ b/include/linux.h
@@ -21,7 +21,6 @@
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
-#include <linux/types.h>
 #include <malloc.h>
 #include <getopt.h>
 #include <endian.h>

diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
index d392d212f1a959bbe3d28c59db6ffc4727dcf0d4..09f7fea7b23f36ecb9535268e1379313f4301c24 100644 (file)
--- a/include/platform_defs.h.in
+++ b/include/platform_defs.h.in
@@ -31,6 +31,18 @@
 #include <unistd.h>
 #include <sys/types.h>
 
+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 <xfs/linux.h>
@@ -38,13 +50,12 @@
 #include <xfs/freebsd.h>
 #elif defined(__APPLE__)
 #include <xfs/darwin.h>
-#elif defined(__sgi__) || defined(___sgi)
+#elif defined(__sgi__) || defined(__sgi)
 #include <xfs/irix.h>
 #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 1128f0b64584c558e3cc05403c302624306369e5..458a1fd67c64625af4d2fda6d07e29ceb1100a2f 100644 (file)
--- 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 155660bdb9b5e6c507047a216383e764b502cac8..bc077a088aca5d93dbcfe3c0439b76fd0b78e3c9 100644 (file)
--- 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 8816b36576d88fd537f9e2664b9b5ed9aa44375f..b93e27f533c8c9f16df0b0d1a432ad92efd7c186 100644 (file)
--- 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 90c36208397faaf8df8f538898c768f73ac1a827..595ba33c320683367b221792bbf6711f9d9cc9ba 100644 (file)
--- 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 4ebe4b0de29b3eca281027aa29d192fc3966b60e..4248f9ef050b1b45b8a9cabd6ceb500c913d93ce 100644 (file)
--- 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 00cae68b8b85eca1aa9a1f315ff04cea6ecb3fbb..f970b640e94ec55a2510dc0e79b21dd68bac50ae 100644 (file)
--- 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;