/*
* icheck.c --- given a list of blocks, generate a list of inodes
- *
+ *
* Copyright (C) 1994 Theodore Ts'o. This file may be redistributed
* under the terms of the GNU Public License.
*/
+#include "config.h"
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include "debugfs.h"
struct block_info {
- blk_t blk;
+ blk64_t blk;
ext2_ino_t ino;
};
ext2_ino_t inode;
};
-static int icheck_proc(ext2_filsys fs,
- blk_t *block_nr,
- e2_blkcnt_t blockcnt,
- blk_t ref_block,
- int ref_offset,
+static int icheck_proc(ext2_filsys fs EXT2FS_ATTR((unused)),
+ blk64_t *block_nr,
+ e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
+ blk64_t ref_block EXT2FS_ATTR((unused)),
+ int ref_offset EXT2FS_ATTR((unused)),
void *private)
{
struct block_walk_struct *bw = (struct block_walk_struct *) private;
e2_blkcnt_t i;
for (i=0; i < bw->num_blocks; i++) {
- if (bw->barray[i].blk == *block_nr) {
+ if (!bw->barray[i].ino && bw->barray[i].blk == *block_nr) {
bw->barray[i].ino = bw->inode;
bw->blocks_left--;
}
}
if (!bw->blocks_left)
return BLOCK_ABORT;
-
+
return 0;
}
struct ext2_inode inode;
errcode_t retval;
char *block_buf;
-
+
if (argc < 2) {
com_err(argv[0], 0, "Usage: icheck <block number> ...");
return;
}
for (i=1; i < argc; i++) {
- if (strtoblk(argv[0], argv[i], &bw.barray[i-1].blk))
- return;
+ if (strtoblk(argv[0], argv[i], NULL, &bw.barray[i-1].blk))
+ goto error_out;
}
bw.num_blocks = bw.blocks_left = argc-1;
com_err("icheck", retval, "while starting inode scan");
goto error_out;
}
-
+
while (ino) {
+ blk64_t blk;
+
if (!inode.i_links_count)
goto next;
- if (!ext2fs_inode_has_valid_blocks(&inode))
+
+ bw.inode = ino;
+
+ blk = ext2fs_file_acl_block(current_fs, &inode);
+ if (blk) {
+ icheck_proc(current_fs, &blk, 0,
+ 0, 0, &bw);
+ if (bw.blocks_left == 0)
+ break;
+ ext2fs_file_acl_block_set(current_fs, &inode, blk);
+ }
+
+ if (!ext2fs_inode_has_valid_blocks2(current_fs, &inode))
goto next;
/*
* To handle filesystems touched by 0.3c extfs; can be
if (inode.i_dtime)
goto next;
- bw.inode = ino;
-
- retval = ext2fs_block_iterate2(current_fs, ino, 0, block_buf,
+ retval = ext2fs_block_iterate3(current_fs, ino,
+ BLOCK_FLAG_READ_ONLY, block_buf,
icheck_proc, &bw);
if (retval) {
com_err("icheck", retval,
printf("Block\tInode number\n");
for (i=0, binfo = bw.barray; i < bw.num_blocks; i++, binfo++) {
if (binfo->ino == 0) {
- printf("%u\t<block not found>\n", binfo->blk);
+ printf("%llu\t<block not found>\n", binfo->blk);
continue;
}
- printf("%u\t%u\n", binfo->blk, binfo->ino);
+ printf("%llu\t%u\n", binfo->blk, binfo->ino);
}
error_out: