From 688a93aef7213732ed899d2500a6b8fad734f5e8 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 20 May 2010 19:20:32 +0000 Subject: * Wed May 19 2010 Eric Sandeen 1.41.12-2 - Fix fsck thinko in 1.41.12 release --- e2fpsrogs-1.41.12-EOFBLOCKS-test.patch | 32 ++++++++++++++++++++++++++++++++ e2fsprogs.spec | 13 ++++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 e2fpsrogs-1.41.12-EOFBLOCKS-test.patch diff --git a/e2fpsrogs-1.41.12-EOFBLOCKS-test.patch b/e2fpsrogs-1.41.12-EOFBLOCKS-test.patch new file mode 100644 index 0000000..1d27de9 --- /dev/null +++ b/e2fpsrogs-1.41.12-EOFBLOCKS-test.patch @@ -0,0 +1,32 @@ +From: Eric Sandeen +Date: Wed, 19 May 2010 18:20:13 +0000 (-0500) +Subject: e2fsck: correct test for EOFBLOCKS +X-Git-Url: http://git.kernel.org/?p=fs%2Fext2%2Fe2fsprogs.git;a=commitdiff_plain;h=ae2272f8459f75c064b2644320db4ec5213d40a9 + +e2fsck: correct test for EOFBLOCKS + +This test, added to e2fsprogs-1.41.12, is backwards. + +If EOFBLOCKS is set, then the size -should- be less than +the last physical block... + +xfstests 013 caught this. + +Signed-off-by: Eric Sandeen +Signed-off-by: Theodore Ts'o +--- + +diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c +index c35937f..4bf80d2 100644 +--- a/e2fsck/pass1.c ++++ b/e2fsck/pass1.c +@@ -2013,7 +2013,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx, + * doesn't need to be. + */ + if ((inode->i_flags & EXT4_EOFBLOCKS_FL) && +- (size <= (((__u64)pb.last_block + 1) * fs->blocksize))) { ++ (size >= (((__u64)pb.last_block + 1) * fs->blocksize))) { + pctx->blkcount = pb.last_block; + if (fix_problem(ctx, PR_1_EOFBLOCKS_FL_SET, pctx)) { + inode->i_flags &= ~EXT4_EOFBLOCKS_FL; + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 4c654cd..6941aa9 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,7 @@ Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs Version: 1.41.12 -Release: 1%{?dist} +Release: 2%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -12,7 +12,8 @@ Group: System Environment/Base Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: ext2_types-wrapper.h -Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch +Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch +Patch2: e2fpsrogs-1.41.12-EOFBLOCKS-test.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -134,7 +135,10 @@ It was originally inspired by the Multics SubSystem library. # ignore some flag differences on primary/backup sb feature checks # mildly unsafe but 'til I get something better, avoid full fsck # after an selinux install... -%patch2 -p1 -b .featurecheck +%patch1 -p1 -b .featurecheck + +# Test for EOFBLOCKS was backwards +%patch2 -p1 -b .EOFBLOCKS %build %configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \ @@ -294,6 +298,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Wed May 19 2010 Eric Sandeen 1.41.12-2 +- Fix fsck thinko in 1.41.12 release + * Mon May 17 2010 Eric Sandeen 1.41.12-1 - New upstream version -- cgit