* Thu Jan 24 2008 Eric Sandeen <sandeen@redhat.com> 1.40.4-7

- Fix sb flag comparisons properly this time (#428893)
- Make 256-byte inodes for the [default] mkfs case.
  This will facilitate upgrades to ext4 later, and help xattr perf.

3 files changed, 41 insertions, 5 deletions

diff --git a/e2fsprogs-1.40.4-big-inodes.patch b/e2fsprogs-1.40.4-big-inodes.patch
new file mode 100644
index 0000000..d841247
--- /dev/null
+++ b/e2fsprogs-1.40.4-big-inodes.patch
@@ -0,0 +1,25 @@
+Index: e2fsprogs-1.40.4/misc/mke2fs.conf
+===================================================================
+--- e2fsprogs-1.40.4.orig/misc/mke2fs.conf
++++ e2fsprogs-1.40.4/misc/mke2fs.conf
+@@ -1,15 +1,19 @@
+ [defaults]
+ 	base_features = sparse_super,filetype,resize_inode,dir_index
+ 	blocksize = 4096
+-	inode_ratio = 8192
++	inode_size = 256
++	inode_ratio = 16384
+ 
+ [fs_types]
+ 	small = {
+ 		blocksize = 1024
++		inode_size = 128
+ 		inode_ratio = 4096
+ 	}
+ 	floppy = {
+ 		blocksize = 1024
++		inode_size = 128
++		inode_ratio = 8192
+ 	}
+ 	news = {
+ 		inode_ratio = 4096
diff --git a/e2fsprogs-1.40.4-sb_feature_check_ignore.patch b/e2fsprogs-1.40.4-sb_feature_check_ignore.patch
index f842b4c..1eafcca 100644
--- a/e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+++ b/e2fsprogs-1.40.4-sb_feature_check_ignore.patch
@@ -2,7 +2,7 @@ Index: e2fsprogs-1.40.4/e2fsck/super.c
 ===================================================================
 --- e2fsprogs-1.40.4.orig/e2fsck/super.c
 +++ e2fsprogs-1.40.4/e2fsck/super.c
-@@ -814,10 +814,29 @@ int check_backup_super_block(e2fsck_t ct
+@@ -814,10 +814,32 @@ int check_backup_super_block(e2fsck_t ct
  			continue;
  		}
  
@@ -22,11 +22,14 @@ Index: e2fsprogs-1.40.4/e2fsck/super.c
 +#define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS)
 +
 +#define SUPER_COMPAT_DIFFERENT(x)	\
-+	((fs->super->x & ~FEATURE_COMPAT_IGNORE) != tfs->super->x)
++	(( fs->super->x & ~FEATURE_COMPAT_IGNORE) !=	\
++	 (tfs->super->x & ~FEATURE_COMPAT_IGNORE))
 +#define SUPER_INCOMPAT_DIFFERENT(x)	\
-+	((fs->super->x & ~FEATURE_INCOMPAT_IGNORE) != tfs->super->x)
++	(( fs->super->x & ~FEATURE_INCOMPAT_IGNORE) !=	\
++	 (tfs->super->x & ~FEATURE_INCOMPAT_IGNORE))
 +#define SUPER_RO_COMPAT_DIFFERENT(x)	\
-+	((fs->super->x & ~FEATURE_RO_COMPAT_IGNORE) != tfs->super->x)
++	(( fs->super->x & ~FEATURE_RO_COMPAT_IGNORE) !=	\
++	 (tfs->super->x & ~FEATURE_RO_COMPAT_IGNORE))
 +#define SUPER_DIFFERENT(x)		\
 +	(fs->super->x != tfs->super->x)
 +
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 6dc3547..70fd89a 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -20,6 +20,7 @@ Patch4: e2fsprogs-1.40.4-uuidd-tidy.patch
 Patch5: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch6: e2fsprogs-1.40.4-blkid-ext4dev.patch
 Patch7: e2fsprogs-1.40.4-no-static-e2fsck.patch
+Patch8: e2fsprogs-1.40.4-big-inodes.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,6 +106,8 @@ SMP systems.
 %patch6 -p1 -b .ext4-blkid
 # completely clobber e2fsck.static build
 %patch7 -p1 -b .e2fsck-static
+# make 256-byte inodes in most cases
+%patch8 -p1 -b .biginodes
 
 %build
 aclocal
@@ -294,6 +297,11 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Thu Jan 24 2008 Eric Sandeen <sandeen@redhat.com> 1.40.4-7
+- Fix sb flag comparisons properly this time (#428893)
+- Make 256-byte inodes for the [default] mkfs case.
+  This will facilitate upgrades to ext4 later, and help xattr perf.
+
 * Wed Jan 23 2008 Eric Sandeen <sandeen@redhat.com> 1.40.4-6
 - Completely clobber e2fsck.static build.