From: Nathan Scott Date: Wed, 17 Oct 2001 00:01:56 +0000 (+0000) Subject: bump version number, document changes. X-Git-Tag: v2.0.0~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31c5308f764dedb48119982a4908a0c4cbc7364d;p=thirdparty%2Fxfsprogs-dev.git bump version number, document changes. --- diff --git a/VERSION b/VERSION index 10d9a8279..e8de20afd 100644 --- 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 fe4815efb..f5dde9d5e 100644 --- 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 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 157ce5a9e..633774543 100644 --- 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 8d9836750..1e68e0407 100644 --- 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 55834e79e..f0abc762e 100644 --- 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 78b246415..1b9108ac9 100644 --- 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 16ece268c..9b2615f3b 100644 --- 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);