From: Nathan Scott <nathans@sgi.com>
Date: Tue, 14 Aug 2001 04:04:00 +0000 (+0000)
Subject: bump version number.
X-Git-Tag: v2.0.0~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6cae4ff90222d3008f1fe21b454b30052c7d9c1;p=thirdparty%2Fxfsprogs-dev.git

bump version number.
---

diff --git a/VERSION b/VERSION
index 0e2eb4a10..2bb55de70 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=3
-PKG_REVISION=4
+PKG_REVISION=5
 PKG_BUILD=0
diff --git a/debian/changelog b/debian/changelog
index 0734efd52..ea7799156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xfsprogs (1.3.5-0) unstable; urgency=low
+
+  * Upstream bugfix release; fixes listed below
+  * Fix bug in xfs_db bit handling on big endian platforms
+  * Fix mkfs.xfs bug related to too-small final allocation group
+  * Fix signedness bug in DMAPI ioctl structure definition
+
+ -- Nathan Scott <nathans@debian.org>  Mon, 13 Aug 2001 09:38:27 +1000
+
 xfsprogs (1.3.4-0) unstable; urgency=low
 
   * Upstream bugfix release; fixes listed below
diff --git a/doc/CHANGES b/doc/CHANGES
index 57d5a3e4f..7fcc1bef1 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,8 @@
+xfsprogs-1.3.5 (13 August 2001)
+	- fix bug in xfs_db bit handling on big endian platforms
+	- fix mkfs bug related to too-small final allocation group
+	- fix signedness bug in DMAPI ioctl structure definition
+
 xfsprogs-1.3.4 (04 August 2001)
 	- fix endian bug in xfs_db "frag" command
 	- small configure script changes to allow cross compilation
diff --git a/mkfs/Makefile b/mkfs/Makefile
index 622f49c9f..aecbd8374 100644
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -55,7 +55,7 @@ default: $(MAXTRRES).h $(FSTYP) $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-$(MAXTRRES):
+$(MAXTRRES): $(MAXTRRES).o
 	$(LTLINK) $@.c -o $@ $(CFLAGS) $(LDFLAGS) $(MAXTRLIBS)
 
 $(MAXTRRES).h: $(MAXTRRES)
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 991a3581b..45e159c14 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1382,15 +1382,33 @@ main(int argc, char **argv)
 		agsize = XFS_AG_MAX_BLOCKS(blocklog);
 		agcount = dblocks / agsize + (dblocks % agsize != 0);
 	}
+
+	/*
+	 * if user set the AG size, and if the last AG is too small,
+	 * reduce the filesystem size and drop the blocks.
+	 */
+	if (!daflag &&
+	    (dblocks % agsize < XFS_AG_MIN_BLOCKS(blocklog))) {
+		dblocks -= dblocks % agsize;
+	}
+
 	/*
 	 * If agcount was not specified, and agsize is larger than
 	 * we'd like, make it the size we want.
 	 */
 	if (!daflag && !dasize &&
-	    (agsize > XFS_AG_BEST_BLOCKS(blocklog, dblocks))) {
-		agsize = XFS_AG_BEST_BLOCKS(blocklog, dblocks);
+	    (agsize > XFS_AG_BEST_BLOCKS(blocklog,dblocks))) {
+		agsize = XFS_AG_BEST_BLOCKS(blocklog,dblocks);
+		/*
+		 * If the last AG is too small, reduce the filesystem size
+		 * and drop the blocks.
+		 */
+		if (dblocks % agsize < XFS_AG_MIN_BLOCKS(blocklog)) {
+			dblocks -= dblocks % agsize;
+		}
 		agcount = dblocks / agsize + (dblocks % agsize != 0);
 	}
+
 	/*
 	 * If agcount is too large, make it smaller.
 	 */