From: Valerie Clement Subject: [RFC][PATCH 9/12] indirect block type conversion in e2fsprogs Date: Mon, 11 Jun 2007 18:54:33 +0200 Message-ID: <466D7E49.8070606@bull.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040706060006070604000008" Cc: ext4 development To: Theodore Tso Return-path: Received: from ecfrec.frec.bull.fr ([129.183.4.8]:49357 "EHLO ecfrec.frec.bull.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753461AbXFKQxM (ORCPT ); Mon, 11 Jun 2007 12:53:12 -0400 Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org This is a multi-part message in MIME format. --------------040706060006070604000008 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1; format=flowed This patch converts the indirect block definitions from blkt_t type to __u32. e2fsck/pass1.c | 2 - lib/ext2fs/block.c | 71 ++++++++++++++++++++++++++++++------------------- lib/ext2fs/ext2fs.h | 4 +- lib/ext2fs/ind_block.c | 4 +- lib/ext2fs/inode.c | 4 +- misc/e2image.c | 2 - 6 files changed, 52 insertions(+), 35 deletions(-) --------------040706060006070604000008 Content-Transfer-Encoding: 7bit Content-Type: text/plain; name="09-indirect-block-type" Content-Disposition: inline; filename="09-indirect-block-type" Index: e2fsprogs-1.39-tyt3-v6/lib/ext2fs/block.c =================================================================== --- e2fsprogs-1.39-tyt3-v6.orig/lib/ext2fs/block.c 2007-06-11 12:48:52.000000000 +0200 +++ e2fsprogs-1.39-tyt3-v6/lib/ext2fs/block.c 2007-06-11 12:48:59.000000000 +0200 @@ -305,7 +305,7 @@ static int block_iterate_ind(blk_t *ind_ { int ret = 0, changed = 0; int i, flags, limit, offset; - blk_t *block_nr; + __u32 *block_nr; limit = ctx->fs->blocksize >> 2; if (!(ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) && @@ -330,33 +330,37 @@ static int block_iterate_ind(blk_t *ind_ return ret; } - block_nr = (blk_t *) ctx->ind_buf; + block_nr = (__u32 *) ctx->ind_buf; offset = 0; if (ctx->flags & BLOCK_FLAG_APPEND) { for (i = 0; i < limit; i++, ctx->bcount++, block_nr++) { - flags = (*ctx->func)(ctx->fs, block_nr, ctx->bcount, + blk_t b = *block_nr; + flags = (*ctx->func)(ctx->fs, &b, ctx->bcount, *ind_block, offset, ctx->priv_data); + *block_nr = b; changed |= flags; if (flags & BLOCK_ABORT) { ret |= BLOCK_ABORT; break; } - offset += sizeof(blk_t); + offset += sizeof(__u32); } } else { for (i = 0; i < limit; i++, ctx->bcount++, block_nr++) { + blk_t b = *block_nr; if (*block_nr == 0) continue; - flags = (*ctx->func)(ctx->fs, block_nr, ctx->bcount, + flags = (*ctx->func)(ctx->fs, &b, ctx->bcount, *ind_block, offset, ctx->priv_data); + *block_nr = b; changed |= flags; if (flags & BLOCK_ABORT) { ret |= BLOCK_ABORT; break; } - offset += sizeof(blk_t); + offset += sizeof(__u32); } } if (changed & BLOCK_CHANGED) { @@ -379,7 +383,7 @@ static int block_iterate_dind(blk_t *din { int ret = 0, changed = 0; int i, flags, limit, offset; - blk_t *block_nr; + __u32 *block_nr; limit = ctx->fs->blocksize >> 2; if (!(ctx->flags & (BLOCK_FLAG_DEPTH_TRAVERSE | @@ -404,35 +408,39 @@ static int block_iterate_dind(blk_t *din return ret; } - block_nr = (blk_t *) ctx->dind_buf; + block_nr = (__u32 *) ctx->dind_buf; offset = 0; if (ctx->flags & BLOCK_FLAG_APPEND) { for (i = 0; i < limit; i++, block_nr++) { - flags = block_iterate_ind(block_nr, + blk_t b = *block_nr; + flags = block_iterate_ind(&b, *dind_block, offset, ctx); + *block_nr = b; changed |= flags; if (flags & (BLOCK_ABORT | BLOCK_ERROR)) { ret |= flags & (BLOCK_ABORT | BLOCK_ERROR); break; } - offset += sizeof(blk_t); + offset += sizeof(__u32); } } else { for (i = 0; i < limit; i++, block_nr++) { + blk_t b = *block_nr; if (*block_nr == 0) { ctx->bcount += limit; continue; } - flags = block_iterate_ind(block_nr, + flags = block_iterate_ind(&b, *dind_block, offset, ctx); + *block_nr = b; changed |= flags; if (flags & (BLOCK_ABORT | BLOCK_ERROR)) { ret |= flags & (BLOCK_ABORT | BLOCK_ERROR); break; } - offset += sizeof(blk_t); + offset += sizeof(__u32); } } if (changed & BLOCK_CHANGED) { @@ -455,7 +463,7 @@ static int block_iterate_tind(blk_t *tin { int ret = 0, changed = 0; int i, flags, limit, offset; - blk_t *block_nr; + __u32 *block_nr; limit = ctx->fs->blocksize >> 2; if (!(ctx->flags & (BLOCK_FLAG_DEPTH_TRAVERSE | @@ -480,35 +488,39 @@ static int block_iterate_tind(blk_t *tin return ret; } - block_nr = (blk_t *) ctx->tind_buf; + block_nr = (__u32 *) ctx->tind_buf; offset = 0; if (ctx->flags & BLOCK_FLAG_APPEND) { for (i = 0; i < limit; i++, block_nr++) { - flags = block_iterate_dind(block_nr, + blk_t b = *block_nr; + flags = block_iterate_dind(&b, *tind_block, offset, ctx); + *block_nr = b; changed |= flags; if (flags & (BLOCK_ABORT | BLOCK_ERROR)) { ret |= flags & (BLOCK_ABORT | BLOCK_ERROR); break; } - offset += sizeof(blk_t); + offset += sizeof(__u32); } } else { for (i = 0; i < limit; i++, block_nr++) { + blk_t b = *block_nr; if (*block_nr == 0) { ctx->bcount += limit*limit; continue; } - flags = block_iterate_dind(block_nr, + flags = block_iterate_dind(&b, *tind_block, offset, ctx); + *block_nr = b; changed |= flags; if (flags & (BLOCK_ABORT | BLOCK_ERROR)) { ret |= flags & (BLOCK_ABORT | BLOCK_ERROR); break; } - offset += sizeof(blk_t); + offset += sizeof(__u32); } } if (changed & BLOCK_CHANGED) { @@ -541,7 +553,7 @@ errcode_t ext2fs_block_iterate2(ext2_fil { int i; int ret = 0; - blk_t blocks[EXT2_N_BLOCKS]; /* directory data blocks */ + __u32 blocks[EXT2_N_BLOCKS]; /* directory data blocks */ struct ext2_inode inode; errcode_t retval; struct block_context ctx; @@ -613,29 +625,34 @@ errcode_t ext2fs_block_iterate2(ext2_fil */ for (i = 0; i < EXT2_NDIR_BLOCKS ; i++, ctx.bcount++) { if (blocks[i] || (flags & BLOCK_FLAG_APPEND)) { - ret |= (*ctx.func)(fs, &blocks[i], + blk_t b = blocks[i]; + ret |= (*ctx.func)(fs, &b, ctx.bcount, 0, i, priv_data); + blocks[i] = b; if (ret & BLOCK_ABORT) goto abort_exit; } } if (*(blocks + EXT2_IND_BLOCK) || (flags & BLOCK_FLAG_APPEND)) { - ret |= block_iterate_ind(blocks + EXT2_IND_BLOCK, - 0, EXT2_IND_BLOCK, &ctx); + blk_t b = *(blocks + EXT2_IND_BLOCK); + ret |= block_iterate_ind(&b, 0, EXT2_IND_BLOCK, &ctx); + *(blocks + EXT2_IND_BLOCK) = b; if (ret & BLOCK_ABORT) goto abort_exit; } else ctx.bcount += limit; if (*(blocks + EXT2_DIND_BLOCK) || (flags & BLOCK_FLAG_APPEND)) { - ret |= block_iterate_dind(blocks + EXT2_DIND_BLOCK, - 0, EXT2_DIND_BLOCK, &ctx); + blk_t b = *(blocks + EXT2_DIND_BLOCK); + ret |= block_iterate_dind(&b, 0, EXT2_DIND_BLOCK, &ctx); + *(blocks + EXT2_DIND_BLOCK) = b; if (ret & BLOCK_ABORT) goto abort_exit; } else ctx.bcount += limit * limit; if (*(blocks + EXT2_TIND_BLOCK) || (flags & BLOCK_FLAG_APPEND)) { - ret |= block_iterate_tind(blocks + EXT2_TIND_BLOCK, - 0, EXT2_TIND_BLOCK, &ctx); + blk_t b = *(blocks + EXT2_TIND_BLOCK); + ret |= block_iterate_tind(&b, 0, EXT2_TIND_BLOCK, &ctx); + *(blocks + EXT2_TIND_BLOCK) = b; if (ret & BLOCK_ABORT) goto abort_exit; } @@ -643,7 +660,7 @@ errcode_t ext2fs_block_iterate2(ext2_fil abort_exit: if (ret & BLOCK_CHANGED) { for (i=0; i < EXT2_N_BLOCKS; i++) - inode.i_block[i] = blocks[i]; + inode.i_block[i] = (__u32)blocks[i]; retval = ext2fs_write_inode(fs, ino, &inode); if (retval) return retval; Index: e2fsprogs-1.39-tyt3-v6/lib/ext2fs/ind_block.c =================================================================== --- e2fsprogs-1.39-tyt3-v6.orig/lib/ext2fs/ind_block.c 2007-06-11 12:48:33.000000000 +0200 +++ e2fsprogs-1.39-tyt3-v6/lib/ext2fs/ind_block.c 2007-06-11 12:48:59.000000000 +0200 @@ -34,7 +34,7 @@ errcode_t ext2fs_read_ind_block(ext2_fil #ifdef EXT2FS_ENABLE_SWAPFS if (fs->flags & (EXT2_FLAG_SWAP_BYTES | EXT2_FLAG_SWAP_BYTES_READ)) { int limit = fs->blocksize >> 2; - blk_t *block_nr = (blk_t *)buf; + __u32 *block_nr = (__u32 *)buf; int i; for (i = 0; i < limit; i++, block_nr++) @@ -52,7 +52,7 @@ errcode_t ext2fs_write_ind_block(ext2_fi #ifdef EXT2FS_ENABLE_SWAPFS if (fs->flags & (EXT2_FLAG_SWAP_BYTES | EXT2_FLAG_SWAP_BYTES_WRITE)) { int limit = fs->blocksize >> 2; - blk_t *block_nr = (blk_t *)buf; + __u32 *block_nr = (__u32 *)buf; int i; for (i = 0; i < limit; i++, block_nr++) Index: e2fsprogs-1.39-tyt3-v6/lib/ext2fs/ext2fs.h =================================================================== --- e2fsprogs-1.39-tyt3-v6.orig/lib/ext2fs/ext2fs.h 2007-06-11 12:48:52.000000000 +0200 +++ e2fsprogs-1.39-tyt3-v6/lib/ext2fs/ext2fs.h 2007-06-11 12:48:59.000000000 +0200 @@ -248,7 +248,7 @@ struct struct_ext2_filsys { int inode_blocks_per_group; ext2fs_inode_bitmap inode_map; ext2fs_block_bitmap block_map; - errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks); + errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, __u32 *blocks); errcode_t (*check_directory)(ext2_filsys fs, ext2_ino_t ino); errcode_t (*write_bitmaps)(ext2_filsys fs); errcode_t (*read_inode)(ext2_filsys fs, ext2_ino_t ino, @@ -937,7 +937,7 @@ extern errcode_t ext2fs_write_inode(ext2 struct ext2_inode * inode); extern errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode * inode); -extern errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks); +extern errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, __u32 *blocks); extern errcode_t ext2fs_check_directory(ext2_filsys fs, ext2_ino_t ino); /* inode_io.c */ Index: e2fsprogs-1.39-tyt3-v6/lib/ext2fs/inode.c =================================================================== --- e2fsprogs-1.39-tyt3-v6.orig/lib/ext2fs/inode.c 2007-06-11 12:48:54.000000000 +0200 +++ e2fsprogs-1.39-tyt3-v6/lib/ext2fs/inode.c 2007-06-11 12:48:59.000000000 +0200 @@ -107,7 +107,7 @@ errcode_t ext2fs_open_inode_scan(ext2_fi { ext2_inode_scan scan; errcode_t retval; - errcode_t (*save_get_blocks)(ext2_filsys f, ext2_ino_t ino, blk_t *blocks); + errcode_t (*save_get_blocks)(ext2_filsys f, ext2_ino_t ino, __u32 *blocks); EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS); @@ -758,7 +758,7 @@ errcode_t ext2fs_write_new_inode(ext2_fi } -errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks) +errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, __u32 *blocks) { struct ext2_inode inode; int i; Index: e2fsprogs-1.39-tyt3-v6/e2fsck/pass1.c =================================================================== --- e2fsprogs-1.39-tyt3-v6.orig/e2fsck/pass1.c 2007-06-11 12:48:57.000000000 +0200 +++ e2fsprogs-1.39-tyt3-v6/e2fsck/pass1.c 2007-06-11 12:48:59.000000000 +0200 @@ -2433,7 +2433,7 @@ static void mark_table_blocks(e2fsck_t c * the inode again. */ static errcode_t pass1_get_blocks(ext2_filsys fs, ext2_ino_t ino, - blk_t *blocks) + __u32 *blocks) { e2fsck_t ctx = (e2fsck_t) fs->priv_data; int i; Index: e2fsprogs-1.39-tyt3-v6/misc/e2image.c =================================================================== --- e2fsprogs-1.39-tyt3-v6.orig/misc/e2image.c 2007-06-11 12:48:54.000000000 +0200 +++ e2fsprogs-1.39-tyt3-v6/misc/e2image.c 2007-06-11 12:48:59.000000000 +0200 @@ -165,7 +165,7 @@ static struct ext2_inode *stashed_inode; static errcode_t meta_get_blocks(ext2_filsys fs EXT2FS_ATTR((unused)), ext2_ino_t ino, - blk_t *blocks) + __u32 *blocks) { int i; --------------040706060006070604000008--