diff options
| author | robi <robi> | 2011-05-10 18:32:15 +0000 |
|---|---|---|
| committer | robi <robi> | 2011-05-10 18:32:15 +0000 |
| commit | eb5fd2882a41c4a2990df79abe0d500fede316ee (patch) | |
| tree | 82902d1efc506ffd34671a9a1cbef5ba45fca723 /src/inode.c | |
| parent | 5bdc925f3e842e1b9993d23c474d5ced8ce86a9d (diff) | |
BUG #018106
Diffstat (limited to 'src/inode.c')
| -rw-r--r-- | src/inode.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/src/inode.c b/src/inode.c index d5ee24e..ecc28a8 100644 --- a/src/inode.c +++ b/src/inode.c @@ -138,11 +138,7 @@ static void local_dump_extents(FILE *f, const char *prefix, struct ext2_inode * if (extent.e_flags & EXT2_EXTENT_FLAGS_LEAF) { if ((flags & DUMP_LEAF_EXTENTS) == 0) continue; - } else { - if ((flags & DUMP_NODE_EXTENTS) == 0) - continue; - } - + } errcode = ext2fs_extent_get_info(handle, &info); if (errcode) @@ -153,17 +149,14 @@ static void local_dump_extents(FILE *f, const char *prefix, struct ext2_inode * continue; if (flags & DUMP_EXTENT_TABLE) { - fprintf(f, "%2d/%2d %3d/%3d %*llu - %*llu " - "%*llu%*s %6u\n", + fprintf(f, "%2d/%2d %3d/%3d %11llu - %11llu " + "%11llu%14s %6u\n", info.curr_level, info.max_depth, info.curr_entry, info.num_entries, - logical_width, extent.e_lblk, - logical_width, extent.e_lblk + (extent.e_len - 1), - physical_width, extent.e_pblk, - physical_width+3, "", extent.e_len); + "", extent.e_len); continue; } @@ -178,23 +171,18 @@ static void local_dump_extents(FILE *f, const char *prefix, struct ext2_inode * } if (flags & DUMP_EXTENT_TABLE) { - fprintf(f, "%2d/%2d %3d/%3d %*llu - %*llu " - "%*llu - %*llu %6u %s\n", + fprintf(f, "%2d/%2d %3d/%3d %11llu - %11llu %11llu - %11llu %6u %s\n", info.curr_level, info.max_depth, info.curr_entry, info.num_entries, - logical_width, extent.e_lblk, - logical_width, extent.e_lblk + (extent.e_len - 1), - physical_width, extent.e_pblk, - physical_width, extent.e_pblk + (extent.e_len - 1), extent.e_len, extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT ? "Uninit" : ""); continue; - } + } if (extent.e_len == 0) continue; @@ -490,7 +478,7 @@ void dump_inode(FILE *out, const char *prefix, } else if (do_dump_blocks && !(inode->i_dtime)) { if (inode->i_flags & EXT4_EXTENTS_FL) local_dump_extents(out, prefix, inode, - DUMP_LEAF_EXTENTS|DUMP_EXTENT_TABLE, 8, 8); + DUMP_LEAF_EXTENTS | DUMP_EXTENT_TABLE, 11, 11); else dump_blocks(out, prefix, inode); } @@ -539,7 +527,7 @@ int get_transaction_inode(ext2_ino_t inode_nr, int transaction_nr, struct ext2_i else { buf =(char*) malloc(blocksize); if(buf){ - //inode = (struct ext2_inode_large *)(buf + blocksize); + retval = read_journal_block(journal_block * blocksize ,buf,blocksize,&got); if ((! retval) && (got == blocksize)){ inode_buf = (struct ext2_inode_large *)(buf + pos.offset); |