mslacken/e2fsprogs
1
0
Fork 0
forked from pool/e2fsprogs
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 20384 from Base:System

Browse Source 
Copy from Base:System/e2fsprogs based on submit request 20384 from user hennevogel

OBS-URL: https://build.opensuse.org/request/show/20384
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=48
This commit is contained in:
OBS User autobuild 2009-09-16 20:16:59 +00:00 committed by Git OBS Bridge
parent e678e7e322
commit 739f9a8c74
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
e2fsprogs-1.41.9-fixsuper.patch Normal file
View File

@ -0,0 +1,32 @@
See http://marc.info/?t=125258740600003&r=1&w=2
diff --git a/e2fsck/super.c b/e2fsck/super.c
index 2202967..76390af 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -821,9 +821,9 @@ void check_super_block(e2fsck_t ctx)
*/
if (fs->super->s_mtime > (__u32) ctx->now) {
pctx.num = fs->super->s_mtime;
- problem = PR_0_FUTURE_SB_LAST_MOUNT;
- if (fs->super->s_mtime <= (__u32) ctx->now + ctx->time_fudge)
- problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+ problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+ if (ctx->time_fudge && fs->super->s_mtime > (__u32) ctx->now + ctx->time_fudge)
+ problem = PR_0_FUTURE_SB_LAST_MOUNT;
if (fix_problem(ctx, problem, &pctx)) {
fs->super->s_mtime = ctx->now;
ext2fs_mark_super_dirty(fs);
@@ -831,9 +831,9 @@ void check_super_block(e2fsck_t ctx)
}
if (fs->super->s_wtime > (__u32) ctx->now) {
pctx.num = fs->super->s_wtime;
- problem = PR_0_FUTURE_SB_LAST_WRITE;
- if (fs->super->s_wtime <= (__u32) ctx->now + ctx->time_fudge)
- problem = PR_0_FUTURE_SB_LAST_MOUNT_FUDGED;
+ problem = PR_0_FUTURE_SB_LAST_WRITE_FUDGED;
+ if (ctx->time_fudge && fs->super->s_wtime > (__u32) ctx->now + ctx->time_fudge)
+ problem = PR_0_FUTURE_SB_LAST_WRITE;
if (fix_problem(ctx, problem, &pctx)) {
fs->super->s_wtime = ctx->now;
ext2fs_mark_super_dirty(fs);

6
e2fsprogs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 10 15:16:55 CEST 2009 - coolo@novell.com
- fix the super block even if someone mounted the file system
in wrong timezone in between (bnc#537542)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 3 10:23:38 CEST 2009 - coolo@novell.com Thu Sep 3 10:23:38 CEST 2009 - coolo@novell.com

5
e2fsprogs.spec
View File

@ -31,7 +31,7 @@ Obsoletes: e2fsprogs-64bit
%endif %endif
# #
Version: 1.41.9 Version: 1.41.9
Release: 1 Release: 2
Summary: Utilities for the Second Extended File System Summary: Utilities for the Second Extended File System
Url: http://e2fsprogs.sourceforge.net Url: http://e2fsprogs.sourceforge.net
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -41,6 +41,8 @@ Source6: %{name}-1.41.4.de.po
# e2fsprogs patches # e2fsprogs patches
# #
Patch7: e2fsprogs-1.41.1-splash_support.patch Patch7: e2fsprogs-1.41.1-splash_support.patch
# UPSTREAM
Patch8: e2fsprogs-1.41.9-fixsuper.patch
# libcom_err patches # libcom_err patches
Patch34: libcom_err-compile_et_permissions.patch Patch34: libcom_err-compile_et_permissions.patch
Patch35: libcom_err-readline.patch Patch35: libcom_err-readline.patch
@ -122,6 +124,7 @@ Development files for the com_err error message display library.
%setup -q %setup -q
# e2fsprogs patches # e2fsprogs patches
%patch7 -p1 %patch7 -p1
%patch8 -p1
# libcom_err patches # libcom_err patches
%patch34 -p1 %patch34 -p1
%patch35 -p1 %patch35 -p1