2009-09-03 21:02:04

by Eric Sandeen

Subject: [PATCH] libext2fs: last of the incorrect direct group_desc accesses

This should be, I hope, the last of the fixes for accessing
the group descriptors directly in libext2fs, at least.

Soon we should make it opaque to avoid this mess.

Signed-off-by: Eric Sandeen <[email protected]>
---

Index: e2fsprogs/lib/ext2fs/openfs.c
===================================================================
--- e2fsprogs.orig/lib/ext2fs/openfs.c
+++ e2fsprogs/lib/ext2fs/openfs.c
@@ -355,7 +355,7 @@ errcode_t ext2fs_open2(const char *name,
for (group = 0; group < fs->group_desc_count; group++) {
ext2fs_bg_flag_clear(fs, group, EXT2_BG_BLOCK_UNINIT);
ext2fs_bg_flag_clear(fs, group, EXT2_BG_INODE_UNINIT);
- fs->group_desc[group].bg_itable_unused = 0;
+ ext2fs_bg_itable_unused_set(fs, group, 0);
}
ext2fs_mark_super_dirty(fs);
}
Index: e2fsprogs/e2fsck/pass2.c
===================================================================
--- e2fsprogs.orig/e2fsck/pass2.c
+++ e2fsprogs/e2fsck/pass2.c
@@ -1003,7 +1003,7 @@ out_htree:
} else if (dirent->inode >= first_unused_inode) {
pctx.num = dirent->inode;
if (fix_problem(ctx, PR_2_INOREF_IN_UNUSED, &cd->pctx)){
- fs->group_desc[group].bg_itable_unused = 0;
+ ext2fs_bg_itable_unused_set(fs, group, 0);
ext2fs_mark_super_dirty(fs);
ctx->flags |= E2F_FLAG_RESTART_LATER;
} else {

2009-09-06 16:42:07

by Theodore Ts'o

Subject: Re: [PATCH] libext2fs: last of the incorrect direct group_desc accesses

On Thu, Sep 03, 2009 at 04:02:04PM -0500, Eric Sandeen wrote:
> This should be, I hope, the last of the fixes for accessing
> the group descriptors directly in libext2fs, at least.

Applied to the 64-bit patch set / pu branch of e2fsprogs.

- Ted