Attachment 160773 Details for Bug 227670 – backport of upstream patch

[patch] backport of upstream patch

fix_resize (text/plain), 4.16 KB, created by Eric Sandeen on 2007-08-06 21:40:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Sandeen

Created: 2007-08-06 21:40:40 UTC

Size: 4.16 KB

patch

obsolete

># HG changeset patch
># User tytso@think.thunk.org
># Date 1113513014 14400
># Node ID 4e4a68eff16f31fdd47229908c24f52598ec9151
># Parent 968e603e040a8a3e0dc48636fff2d2137e42fda9
>Don't offer to update or clone the resize inode when e2fsck deals with
>multiply claimed blocks.
>
>
>Index: e2fsprogs-1.35-RHEL4/e2fsck/ChangeLog
>===================================================================
>--- e2fsprogs-1.35-RHEL4.orig/e2fsck/ChangeLog
>+++ e2fsprogs-1.35-RHEL4/e2fsck/ChangeLog
>@@ -51,6 +51,11 @@
> 		an extended attribute to be not fixed.  (Addresses Debian
> 		Bug: #316736)
> 
>+ 2005-04-14  Theodore Ts'o  <tytso@mit.edu>
>+
>+	* pass1b.c (pass1d): Don't offer to clone or delete the resize
>+		inode; it's not allowed!
>+
> 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
> 
> 	* Release of E2fsprogs 1.35
>Index: e2fsprogs-1.35-RHEL4/e2fsck/pass1b.c
>===================================================================
>--- e2fsprogs-1.35-RHEL4.orig/e2fsck/pass1b.c
>+++ e2fsprogs-1.35-RHEL4/e2fsck/pass1b.c
>@@ -428,7 +428,7 @@ static void pass1d(e2fsck_t ctx, char *b
> 		shared_len = 0;
> 		file_ok = 1;
> 		ino = (ext2_ino_t)VOIDPTR_TO_INT(dnode_getkey(n));
>-		if (ino == EXT2_BAD_INO)
>+		if (ino == EXT2_BAD_INO || ino == EXT2_RESIZE_INO)
> 			continue;
> 
> 		/*
>Index: e2fsprogs-1.35-RHEL4/tests/ChangeLog
>===================================================================
>--- e2fsprogs-1.35-RHEL4.orig/tests/ChangeLog
>+++ e2fsprogs-1.35-RHEL4/tests/ChangeLog
>@@ -1,3 +1,7 @@
>+2005-04-14  Theodore Ts'o  <tytso@mit.edu>
>+
>+	* f_dup_resize: New test case
>+
> 2004-02-28  Theodore Ts'o  <tytso@mit.edu>
> 
> 	* Release of E2fsprogs 1.35
>Index: e2fsprogs-1.35-RHEL4/tests/f_dup_resize/expect.1
>===================================================================
>--- /dev/null
>+++ e2fsprogs-1.35-RHEL4/tests/f_dup_resize/expect.1
>@@ -0,0 +1,33 @@
>+Resize inode not valid.  Recreate? yes
>+
>+Pass 1: Checking inodes, blocks, and sizes
>+Duplicate blocks found... invoking duplicate block passes.
>+Pass 1B: Rescan for duplicate/bad blocks
>+Duplicate/bad block(s) in inode 7: 4 5 6 7
>+Duplicate/bad block(s) in inode 12: 4 5 6 7
>+Pass 1C: Scan directories for inodes with dup blocks.
>+Pass 1D: Reconciling duplicate blocks
>+(There are 1 inodes containing duplicate/bad blocks.)
>+
>+File /debugfs (inode #12, mod time Mon Apr 11 00:00:00 2005) 
>+  has 4 duplicate block(s), shared with 1 file(s):
>+	<The group descriptor inode> (inode #7, mod time Mon Apr 11 06:13:20 2005)
>+Clone duplicate/bad blocks? yes
>+
>+Pass 2: Checking directory structure
>+Pass 3: Checking directory connectivity
>+Pass 4: Checking reference counts
>+Pass 5: Checking group summary information
>+Block bitmap differences:  +(8195--8198)
>+Fix? yes
>+
>+Free blocks count wrong for group #0 (7910, counted=7911).
>+Fix? yes
>+
>+Free blocks count wrong (9754, counted=9755).
>+Fix? yes
>+
>+
>+test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
>+test_filesys: 12/2560 files (8.3% non-contiguous), 485/10240 blocks
>+Exit status is 1
>Index: e2fsprogs-1.35-RHEL4/tests/f_dup_resize/expect.2
>===================================================================
>--- /dev/null
>+++ e2fsprogs-1.35-RHEL4/tests/f_dup_resize/expect.2
>@@ -0,0 +1,7 @@
>+Pass 1: Checking inodes, blocks, and sizes
>+Pass 2: Checking directory structure
>+Pass 3: Checking directory connectivity
>+Pass 4: Checking reference counts
>+Pass 5: Checking group summary information
>+test_filesys: 12/2560 files (16.7% non-contiguous), 485/10240 blocks
>+Exit status is 0
>Index: e2fsprogs-1.35-RHEL4/tests/f_dup_resize/name
>===================================================================
>--- /dev/null
>+++ e2fsprogs-1.35-RHEL4/tests/f_dup_resize/name
>@@ -0,0 +1 @@
>+blocks claimed by the resize inode and another inode
>Index: e2fsprogs-1.35-RHEL4/tests/f_dup_resize/script
>===================================================================
>--- /dev/null
>+++ e2fsprogs-1.35-RHEL4/tests/f_dup_resize/script
>@@ -0,0 +1,18 @@
>+SKIP_GUNZIP="true"
>+
>+touch $TMPFILE
>+mke2fs -F -O resize_inode $TMPFILE 10240 > /dev/null 2>&1
>+debugfs -w $TMPFILE << "EOF" > /dev/null 2>&1
>+freeb 4 4
>+freeb 8195 4
>+write /sbin/debugfs debugfs
>+set_inode_field debugfs mtime 200504110000
>+q
>+EOF
>+
>+E2FSCK_TIME=1113200000
>+export E2FSCK_TIME
>+
>+. $cmd_dir/run_e2fsck
>+
>+unset E2FSCK_TIME

Actions: View | Diff

Attachments on bug 227670: 160773