Bump xfsprogs version to 2.8.x, fix some minor build issues.

Merge of master-melb:xfs-cmds:25970a by kenmcd.

diff --git a/VERSION b/VERSION
index f3b44c7cd1c6f58240b868c9c8afcc8bec210c6c..d2b5331a4aabd7c282b679173420ae50a0426bc9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,6 +2,6 @@
 # This file is used by configure to get version information
 #
 PKG_MAJOR=2
-PKG_MINOR=7
-PKG_REVISION=18
+PKG_MINOR=8
+PKG_REVISION=0
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index 3d6a16b66bd73c51e2f8a6d7f03dc5ca3848233b..71f2d5968fe97e916b992b2a3911e4a4bddb434d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.8.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 18 May 2006 16:27:47 +1000
+
 xfsprogs (2.7.16-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/doc/CHANGES b/doc/CHANGES
index 0d03a6611165bb18f05bf6abc47a12ecd32637f2..c683cf620d666786fa95e559c1eb8e24ede5f436 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,9 +1,14 @@
-[cvs]
+xfsprogs-2.8.0 (18 May 2006)
+       - Initial pass at user space caching, ultimately provides
+         a starting point for a faster, parallel version of repair.
+       - Fix several inode/buffer reference counting issues.
+       - Fix compiler warnings, and builds on certain glibc versions
+         having issues with the device major() macro.
        - Added code to xfs_db and xfs_admin to allow conversion
          from version 1 to version 2 logs.
 
 xfsprogs-2.7.18 (16 May 2006)
-       - Fixed a case where xfs_repair was reporting a valid used 
+       - Fixed a case where xfs_repair was reporting a valid used
          block as a duplicate during phase 4.
        - Fixed a case where xfs_repair could incorrectly flag extent
          b+tree nodes as corrupt.

diff --git a/include/linux.h b/include/linux.h
index e6dc58ff0ba685adf268e45814e514ebf51c73b1..62b8e58d91c0a0d8f781ecdcf1c81165d88e9180 100644 (file)
--- a/include/linux.h
+++ b/include/linux.h
@@ -21,6 +21,7 @@
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
+#include <sys/sysmacros.h>
 #include <malloc.h>
 #include <getopt.h>
 #include <endian.h>

diff --git a/libxfs/init.c b/libxfs/init.c
index b5ae26edc7e709d2bc888ae2df9c1ca4ccf36645..acee677d07a553b98a311d0e673347687aef4c47 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -81,6 +81,7 @@ libxfs_device_to_fd(dev_t device)
        fprintf(stderr, _("%s: %s: device %lld is not open\n"),
                progname, __FUNCTION__, (long long)device);
        exit(1);
+       /* NOTREACHED */
 }
 
 /* libxfs_device_open:
@@ -141,6 +142,7 @@ libxfs_device_open(char *path, int creat, int xflags, int setblksize)
        fprintf(stderr, _("%s: %s: too many open devices\n"),
                progname, __FUNCTION__);
        exit(1);
+       /* NOTREACHED */
 }
 
 void