Patchwork libext2: advance group in ext2fs_open2 during swapping

login
register
mail settings
Submitter Eric Sandeen
Date Nov. 8, 2011, 10:26 p.m.
Message ID <4EB9AC9B.5020803@redhat.com>
Download mbox | patch
Permalink /patch/124448/
State Accepted
Headers show

Comments

Eric Sandeen - Nov. 8, 2011, 10:26 p.m.
Without this change, we go back to getting group descriptor
"0" each time we go around the "for i" loop.  It must properly
advance through the filesystem.

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

(I couldn't decipher the removed comment; maybe it was typed when
you thought you would do:

                        gdp = ext2fs_group_desc(fs, dest, j);

which would also work ... ?  It'd be clever, but I think my change
is more explicitly obvious.  Either way works.

We still have failing tests but at least nothing hangs now:
Tests failed: f_mmp f_mmp_garbage m_mmp t_mmp_1on t_mmp_2off 



--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - Nov. 10, 2011, 12:02 p.m.
On Tue, Nov 08, 2011 at 04:26:35PM -0600, Eric Sandeen wrote:
> Without this change, we go back to getting group descriptor
> "0" each time we go around the "for i" loop.  It must properly
> advance through the filesystem.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Thanks, applied.

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 0cefe3f..40a52c5 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -356,8 +356,8 @@  errcode_t ext2fs_open2(const char *name, const char *io_options,
 			goto cleanup;
 #ifdef WORDS_BIGENDIAN
 		for (j=0; j < groups_per_block; j++) {
-			/* The below happens to work... be careful. */
-			gdp = ext2fs_group_desc(fs, fs->group_desc, j);
+			gdp = ext2fs_group_desc(fs, fs->group_desc,
+						i * groups_per_block + j);
 			ext2fs_swap_group_desc2(fs, gdp);
 		}
 #endif