diff options
| author | Eric Sandeen <sandeen@fedoraproject.org> | 2010-05-20 19:20:32 +0000 |
|---|---|---|
| committer | Eric Sandeen <sandeen@fedoraproject.org> | 2010-05-20 19:20:32 +0000 |
| commit | 688a93aef7213732ed899d2500a6b8fad734f5e8 (patch) | |
| tree | 7c3cec0b73986e4b69a42f72db52f01244f0b397 | |
| parent | af34ee0faa72e16cbc63d7e2debfdd8a922c533e (diff) | |
| download | e2fsprogs-1_41_12-2_fc14.tar.gz e2fsprogs-1_41_12-2_fc14.tar.xz e2fsprogs-1_41_12-2_fc14.zip | |
* Wed May 19 2010 Eric Sandeen <sandeen@redhat.com> 1.41.12-2e2fsprogs-1_41_12-2_fc14
- Fix fsck thinko in 1.41.12 release
| -rw-r--r-- | e2fpsrogs-1.41.12-EOFBLOCKS-test.patch | 32 | ||||
| -rw-r--r-- | e2fsprogs.spec | 13 |
2 files changed, 42 insertions, 3 deletions
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 <sandeen@redhat.com> +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 <sandeen@redhat.com> +Signed-off-by: Theodore Ts'o <tytso@mit.edu> +--- + +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 <sandeen@redhat.com> 1.41.12-2 +- Fix fsck thinko in 1.41.12 release + * Mon May 17 2010 Eric Sandeen <sandeen@redhat.com> 1.41.12-1 - New upstream version |