bump version number, document changes.

diff --git a/VERSION b/VERSION
index 10d9a82795d786d90815f8bc62c2e855b29414ac..e8de20afd0c0f99e3eb056e97a61732d527c069a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=3
-PKG_REVISION=10
+PKG_REVISION=11
 PKG_BUILD=0

diff --git a/debian/changelog b/debian/changelog
index fe4815efb6513977dc055d1e254f08958594090f..f5dde9d5e9911982baffc81837a4dc42f36da248 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (1.3.11-0) unstable; urgency=low
+
+  * Upstream release fixing several issues on 64 bit platforms
+
+ -- Nathan Scott <nathans@debian.org>  Wed, 17 Oct 2001 10:00:35 +1000
+
 xfsprogs (1.3.10-0) unstable; urgency=low
 
   * New upstream release

diff --git a/doc/CHANGES b/doc/CHANGES
index 157ce5a9e23fc7d9db1551ee23d8d43ce7db1c37..633774543c0d0a4079375f6d241c3b6269c7e5af 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,9 @@
+xfsprogs-1.3.11 (17 October 2001)
+       - tidy up some (benign) compiler warnings from libxfs
+       - fixed 64-bit pointer alignment issues in xfs_check
+       - fixed 64-bit pointer alignment issues in xfs_repair
+       - verified these on IA64, also reported to fix sparc issues
+
 xfsprogs-1.3.10 (12 October 2001)
        - sync with XFS kernel header changes for EAs by-handle
        - ported xfs_imap command for dumping the inode map

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 8d9836750fabf448f2e1b51c05e6c0d47f247b56..1e68e0407c34522b291c635d5ccf88d6e6e84090 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3458,8 +3458,9 @@ xfs_bmap_read_extents(
                if (i + num_recs > room) {
                        ASSERT(i + num_recs <= room);
                        xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-       "corrupt dinode %Lu, (btree extents). Unmount and run xfs_repair.",
-                       ip->i_ino);
+                               "corrupt dinode %Lu, (btree extents).  "
+                               "Unmount and run xfs_repair.",
+                               (unsigned long long) ip->i_ino);
                        goto error0;
                }
                XFS_WANT_CORRUPTED_GOTO(

diff --git a/libxfs/xfs_dir_leaf.c b/libxfs/xfs_dir_leaf.c
index 55834e79eef7da891f9f77ebe40460417b1a2adb..f0abc762e89d4b4572bfa4a424acf791ce5d6c3e 100644 (file)
--- a/libxfs/xfs_dir_leaf.c
+++ b/libxfs/xfs_dir_leaf.c
@@ -62,8 +62,8 @@ xfs_dir_ino_validate(xfs_mount_t *mp, xfs_ino_t ino)
                XFS_AGINO_TO_INO(mp, agno, agino) == ino;
        if (XFS_TEST_ERROR(!ino_ok, mp, XFS_ERRTAG_DIR_INO_VALIDATE,
                        XFS_RANDOM_DIR_INO_VALIDATE)) {
-               xfs_fs_cmn_err(CE_WARN, mp,
-                       "Invalid inode number 0x%Lx\n", ino);
+               xfs_fs_cmn_err(CE_WARN, mp, "Invalid inode number 0x%Lx\n",
+                               (unsigned long long) ino);
                return XFS_ERROR(EFSCORRUPTED);
        }
        return 0;

diff --git a/libxfs/xfs_inode.c b/libxfs/xfs_inode.c
index 78b246415f925ed2d3aeac8130af543b4142421b..1b9108ac94ef4f1691cab7480c480b997f81865c 100644 (file)
--- a/libxfs/xfs_inode.c
+++ b/libxfs/xfs_inode.c
@@ -221,17 +221,22 @@ xfs_iformat(
                 INT_GET(dip->di_core.di_anextents, ARCH_CONVERT) >
            INT_GET(dip->di_core.di_nblocks, ARCH_CONVERT)) {
                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                       "corrupt dinode %Lu, extent total = %d, nblocks = %Ld.  Unmount and run xfs_repair.",
-                       ip->i_ino,
-                       (int)(INT_GET(dip->di_core.di_nextents, ARCH_CONVERT) + INT_GET(dip->di_core.di_anextents, ARCH_CONVERT)),
+                       "corrupt dinode %Lu, extent total = %d, nblocks = %Lu."
+                       "  Unmount and run xfs_repair.",
+                       (unsigned long long)ip->i_ino,
+                       (int)(INT_GET(dip->di_core.di_nextents, ARCH_CONVERT)
+                           + INT_GET(dip->di_core.di_anextents, ARCH_CONVERT)),
+                       (unsigned long long)
                        INT_GET(dip->di_core.di_nblocks, ARCH_CONVERT));
                return XFS_ERROR(EFSCORRUPTED);
        }
 
        if (INT_GET(dip->di_core.di_forkoff, ARCH_CONVERT) > ip->i_mount->m_sb.sb_inodesize) {
                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                       "corrupt dinode %Lu, forkoff = 0x%x.  Unmount and run xfs_repair.",
-                       ip->i_ino, (int)(INT_GET(dip->di_core.di_forkoff, ARCH_CONVERT)));
+                       "corrupt dinode %Lu, forkoff = 0x%x."
+                       "  Unmount and run xfs_repair.",
+                       (unsigned long long)ip->i_ino,
+                       (int)(INT_GET(dip->di_core.di_forkoff, ARCH_CONVERT)));
                return XFS_ERROR(EFSCORRUPTED);
        }
 
@@ -256,17 +261,22 @@ xfs_iformat(
                         */
                        if ((INT_GET(dip->di_core.di_mode, ARCH_CONVERT) & IFMT) == IFREG) {
                                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                                       "corrupt inode (local format for regular file) %Lu.  Unmount and run xfs_repair.",
-                                       ip->i_ino);
+                                       "corrupt inode "
+                                       "(local format for regular file) %Lu.  "
+                                       "Unmount and run xfs_repair.",
+                                       (unsigned long long) ip->i_ino);
                                return XFS_ERROR(EFSCORRUPTED);
                        }
-                        
-                        di_size=INT_GET(dip->di_core.di_size, ARCH_CONVERT);
+
+                       di_size = INT_GET(dip->di_core.di_size, ARCH_CONVERT);
                        if (di_size >
                            XFS_DFORK_DSIZE_ARCH(dip, ip->i_mount, ARCH_CONVERT)) {
                                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                                       "corrupt inode %Lu (bad size %Ld for local inode).  Unmount and run xfs_repair.",
-                                       ip->i_ino, di_size);
+                                       "corrupt inode %Lu "
+                                       "(bad size %Ld for local inode).  "
+                                       "Unmount and run xfs_repair.",
+                                       (unsigned long long) ip->i_ino,
+                                       (long long) di_size);
                                return XFS_ERROR(EFSCORRUPTED);
                        }
 
@@ -354,8 +364,10 @@ xfs_iformat_local(
         */
        if (size > XFS_DFORK_SIZE_ARCH(dip, ip->i_mount, whichfork, ARCH_CONVERT)) {
                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                       "corrupt inode %Lu (bad size %d for local fork, size = %d).  Unmount and run xfs_repair.",
-                       ip->i_ino, size,
+                       "corrupt inode %Lu "
+                       "(bad size %d for local fork, size = %d).  "
+                       "Unmount and run xfs_repair.",
+                       (unsigned long long) ip->i_ino, size,
                        XFS_DFORK_SIZE_ARCH(dip, ip->i_mount, whichfork, ARCH_CONVERT));
                return XFS_ERROR(EFSCORRUPTED);
        }
@@ -410,8 +422,9 @@ xfs_iformat_extents(
         */
        if (size < 0 || size > XFS_DFORK_SIZE_ARCH(dip, ip->i_mount, whichfork, ARCH_CONVERT)) {
                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                       "corrupt inode %Lu ((a)extents = %d).  Unmount and run xfs_repair.",
-                       ip->i_ino, nex);
+                       "corrupt inode %Lu ((a)extents = %d).  "
+                       "Unmount and run xfs_repair.",
+                       (unsigned long long) ip->i_ino, nex);
                return XFS_ERROR(EFSCORRUPTED);
        }
 
@@ -483,8 +496,9 @@ xfs_iformat_btree(
                        XFS_DFORK_SIZE_ARCH(dip, ip->i_mount, whichfork, ARCH_CONVERT)
            || XFS_IFORK_NEXTENTS(ip, whichfork) > ip->i_d.di_nblocks) {
                xfs_fs_cmn_err(CE_WARN, ip->i_mount,
-                       "corrupt inode %Lu (btree).  Unmount and run xfs_repair.",
-                       ip->i_ino);
+                       "corrupt inode %Lu (btree).  "
+                       "Unmount and run xfs_repair.",
+                       (unsigned long long) ip->i_ino);
                return XFS_ERROR(EFSCORRUPTED);
        }
 

diff --git a/libxfs/xfs_rtalloc.c b/libxfs/xfs_rtalloc.c
index 16ece268c0fa778dea197d0b729b5230cf98b0ea..9b2615f3b796c19f2aea939587b6cf40514cd445 100644 (file)
--- a/libxfs/xfs_rtalloc.c
+++ b/libxfs/xfs_rtalloc.c
@@ -819,7 +819,8 @@ xfs_rtmount_init(
        d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_rblocks);
        if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_rblocks) {
                printk(KERN_WARNING "XFS: RT mount - %llu != %llu\n",
-                       XFS_BB_TO_FSB(mp, d), mp->m_sb.sb_rblocks);
+                       (unsigned long long) XFS_BB_TO_FSB(mp, d),
+                       (unsigned long long) mp->m_sb.sb_rblocks);
                return XFS_ERROR(E2BIG);
        }
        error = xfs_read_buf(mp, &mp->m_rtdev_targ, d - 1, 1, 0, &bp);