rpms/e2fsprogs/devel e2fsprogs-fix-blkid.patch, NONE, 1.1 e2fsprogs.spec, 1.121, 1.122

[Eric Sandeen]

Author: sandeen

Update of /cvs/pkgs/rpms/e2fsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6015

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-fix-blkid.patch 
Log Message:
* Thu Oct 02 2008 Eric Sandeen <sandeen at redhat.com> 1.41.2-2
- Fix blkid to recognize ext4dev filesystems as ext4-mountable


e2fsprogs-fix-blkid.patch:

--- NEW FILE e2fsprogs-fix-blkid.patch ---
If only ext4 is available (as a module or in /proc/filesystems)
blkid wasn't properly testing for it, because the time checks
were backwards and always failed.  This caused old ext4dev
filesystems to fail to mount as ext4.  With this patch it works
fine.

Signed-off-by: Eric Sandeen <sandeen at redhat.com>
---

Index: e2fsprogs/lib/blkid/probe.c
===================================================================
--- e2fsprogs.orig/lib/blkid/probe.c	2008-09-12 10:37:52.000000000 -0500
+++ e2fsprogs/lib/blkid/probe.c	2008-10-08 13:28:42.218001472 -0500
@@ -243,7 +243,7 @@ static int system_supports_ext4(void)
 	static int	ret = -1;
 	time_t		now = time(0);
 
-	if (ret != -1 || (last_check - now) < 5)
+	if (ret != -1 || (now - last_check) < 5)
 		return ret;
 	last_check = now;
 	ret = (fs_proc_check("ext4") || check_for_modules("ext4"));
@@ -256,7 +256,7 @@ static int system_supports_ext4dev(void)
 	static int	ret = -1;
 	time_t		now = time(0);
 
-	if (ret != -1 || (last_check - now) < 5)
+	if (ret != -1 || (now - last_check) < 5)
 		return ret;
 	last_check = now;
 	ret = (fs_proc_check("ext4dev") || check_for_modules("ext4dev"));


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- e2fsprogs.spec	2 Oct 2008 19:19:50 -0000	1.121
+++ e2fsprogs.spec	8 Oct 2008 20:57:05 -0000	1.122
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.41.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
@@ -16,6 +16,7 @@
 Patch1: e2fsprogs-1.38-etcblkid.patch
 Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
 Patch3: e2fsprogs-journal-move.patch
+Patch4: e2fsprogs-fix-blkid.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +95,8 @@
 %patch2 -p1 -b .featurecheck
 # Only change the journal placement for ext4, for now.
 %patch3 -p1 -b .journalmove
+# Fix blkid to recognize ext4dev as mountable by ext4
+%patch4 -p1 -b .blkid
 
 %build
 %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
@@ -292,6 +295,9 @@
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
 %changelog
+* Thu Oct 02 2008 Eric Sandeen <sandeen at redhat.com> 1.41.2-2
+- Fix blkid to recognize ext4dev filesystems as ext4-mountable
+
 * Thu Oct 02 2008 Eric Sandeen <sandeen at redhat.com> 1.41.2-1
 - New upstream version
 - Updated default dir hash (half_md4) for better perf & fewer collisions