Add in missing sb_feature2 field into endian conversion table. Fix from Chris Pascoe...

diff --git a/VERSION b/VERSION
index 495b062fceea567dc2201300032de06c54883193..4fedc4dde9e1080f1a9c1daa391ebc16fa0eb7b2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=6
-PKG_REVISION=9
+PKG_REVISION=10
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index 97b2c5caa2cce6099f9a9cfdc512c86b05c31fda..049be343b848d87e881286e64dbdc10ba82215c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xfsprogs (2.6.9-1) unstable; urgency=low
+xfsprogs (2.6.10-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Nathan Scott <nathans@debian.org>  Sat, 27 Mar 2004 10:50:11 +1100
+ -- Nathan Scott <nathans@debian.org>  Mon, 05 Apr 2004 12:08:19 +1000
 
 xfsprogs (2.6.5-1) unstable; urgency=low
 

diff --git a/doc/CHANGES b/doc/CHANGES
index 4648c698210ccff051ea528209d2fe9d2a7f6c4a..b8aa080c722c4f5fd52f9a5b5b66ccdb3ce2c0e1 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,14 @@
+xfsprogs-2.6.10 (05 April 2003)
+       - Fix botch in recent addition of new superblock field
+         (features2) which could result in filesystems with v2
+         logs being created with invalid superblock fields.
+         Thanks to Chris Pascoe for this fix.
+       - Fix error when forcing a too-large v2 log stripe size
+         back to 32K.  Thanks to Chris Pascoe for this fix too.
+       - Fix xfs_copy -d option so that it really does create a
+         duplicate filesystem (the log is duplicated too now in
+         that case, whereas previously a fresh log was created).
+
 xfsprogs-2.6.9 (26 March 2003)
        - Update HFILES in xfsprogs/io/Makefile to package io/io.h
 

diff --git a/libxfs/xfs_mount.c b/libxfs/xfs_mount.c
index 4f471ff9a1aa2b8ae92b1d40e3cef44fe0841d10..32035c7e03b5d8f8ea530f89add9c0ed9235c0c4 100644 (file)
--- a/libxfs/xfs_mount.c
+++ b/libxfs/xfs_mount.c
@@ -152,6 +152,7 @@ static struct {
     { offsetof(xfs_sb_t, sb_logsectlog), 0 },
     { offsetof(xfs_sb_t, sb_logsectsize),0 },
     { offsetof(xfs_sb_t, sb_logsunit),  0 },
+    { offsetof(xfs_sb_t, sb_features2),         0 },
     { sizeof(xfs_sb_t),                         0 }
 };