/*
* htree.c --- hash tree routines
- *
+ *
* Copyright (C) 2002 Theodore Ts'o. This file may be redistributed
* under the terms of the GNU Public License.
*/
#include <sys/types.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
-#else
+#else
extern int optind;
extern char *optarg;
#endif
#include "debugfs.h"
+#include "uuid/uuid.h"
+#include "e2p/e2p.h"
static FILE *pager;
static void htree_dump_leaf_node(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
struct ext2_dx_root_info * rootnode,
- blk_t blk, char *buf)
+ blk64_t blk, char *buf)
{
errcode_t errcode;
struct ext2_dir_entry *dirent;
unsigned int offset = 0;
char name[EXT2_NAME_LEN + 1];
char tmp[EXT2_NAME_LEN + 16];
- blk_t pblk;
- ext2_dirhash_t hash;
+ blk64_t pblk;
+ ext2_dirhash_t hash, minor_hash;
+ unsigned int rec_len;
int hash_alg;
-
- errcode = ext2fs_bmap(fs, ino, inode, buf, 0, blk, &pblk);
+
+ errcode = ext2fs_bmap2(fs, ino, inode, buf, 0, blk, 0, &pblk);
if (errcode) {
com_err("htree_dump_leaf_node", errcode,
- "while mapping logical block %u\n", blk);
+ "while mapping logical block %llu\n", blk);
return;
}
+ printf("Reading directory block %llu, phys %llu\n", blk, pblk);
errcode = ext2fs_read_dir_block2(current_fs, pblk, buf, 0);
if (errcode) {
com_err("htree_dump_leaf_node", errcode,
- "while reading block %u\n", blk);
+ "while reading block %llu (%llu)\n",
+ blk, pblk);
return;
}
hash_alg = rootnode->hash_version;
while (offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (buf + offset);
- if (((offset + dirent->rec_len) > fs->blocksize) ||
- (dirent->rec_len < 8) ||
- ((dirent->rec_len % 4) != 0) ||
- (((dirent->name_len & 0xFF)+8) > dirent->rec_len)) {
- fprintf(pager, "Corrupted directory block (%u)!\n", blk);
+ errcode = ext2fs_get_rec_len(fs, dirent, &rec_len);
+ if (errcode) {
+ com_err("htree_dump_leaf_inode", errcode,
+ "while getting rec_len for block %lu",
+ (unsigned long) blk);
+ return;
+ }
+ if (((offset + rec_len) > fs->blocksize) ||
+ (rec_len < 8) ||
+ ((rec_len % 4) != 0) ||
+ ((((unsigned) dirent->name_len & 0xFF)+8) > rec_len)) {
+ fprintf(pager, "Corrupted directory block (%llu)!\n",
+ blk);
break;
}
thislen = ((dirent->name_len & 0xFF) < EXT2_NAME_LEN) ?
name[thislen] = '\0';
errcode = ext2fs_dirhash(hash_alg, name,
thislen, fs->super->s_hash_seed,
- &hash, 0);
+ &hash, &minor_hash);
if (errcode)
com_err("htree_dump_leaf_node", errcode,
"while calculating hash");
- sprintf(tmp, "%u 0x%08x (%d) %s ", dirent->inode,
- hash, dirent->rec_len, name);
+ sprintf(tmp, "%u 0x%08x-%08x (%d) %s ", dirent->inode,
+ hash, minor_hash, rec_len, name);
thislen = strlen(tmp);
if (col + thislen > 80) {
fprintf(pager, "\n");
}
fprintf(pager, "%s", tmp);
col += thislen;
- offset += dirent->rec_len;
+ offset += rec_len;
}
fprintf(pager, "\n");
}
static void htree_dump_int_block(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
struct ext2_dx_root_info * rootnode,
- blk_t blk, char *buf, int level);
+ blk64_t blk, char *buf, int level);
static void htree_dump_int_node(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
struct ext2_dx_root_info * rootnode,
- struct ext2_dx_entry *ent,
+ struct ext2_dx_entry *ent,
char *buf, int level)
{
struct ext2_dx_countlimit limit;
struct ext2_dx_entry e;
int hash, i;
-
+
limit = *((struct ext2_dx_countlimit *) ent);
limit.count = ext2fs_le16_to_cpu(limit.count);
static void htree_dump_int_block(ext2_filsys fs, ext2_ino_t ino,
struct ext2_inode *inode,
struct ext2_dx_root_info * rootnode,
- blk_t blk, char *buf, int level)
+ blk64_t blk, char *buf, int level)
{
char *cbuf;
errcode_t errcode;
- blk_t pblk;
+ blk64_t pblk;
cbuf = malloc(fs->blocksize);
if (!cbuf) {
fprintf(pager, "Couldn't allocate child block.\n");
return;
}
-
- errcode = ext2fs_bmap(fs, ino, inode, buf, 0, blk, &pblk);
+
+ errcode = ext2fs_bmap2(fs, ino, inode, buf, 0, blk, 0, &pblk);
if (errcode) {
com_err("htree_dump_int_block", errcode,
- "while mapping logical block %u\n", blk);
+ "while mapping logical block %llu\n", blk);
goto errout;
}
- errcode = io_channel_read_blk(current_fs->io, pblk, 1, buf);
+ errcode = io_channel_read_blk64(current_fs->io, pblk, 1, buf);
if (errcode) {
com_err("htree_dump_int_block", errcode,
- "while reading block %u\n", blk);
+ "while reading block %llu\n", blk);
goto errout;
}
{
ext2_ino_t ino;
struct ext2_inode inode;
- int c;
- int long_opt = 0;
+ blk64_t blk;
char *buf = NULL;
struct ext2_dx_root_info *rootnode;
struct ext2_dx_entry *ent;
pager = open_pager();
- reset_getopt();
- while ((c = getopt (argc, argv, "l")) != EOF) {
- switch (c) {
- case 'l':
- long_opt++;
- break;
- default:
- goto print_usage;
- }
- }
-
- if (argc > optind+1) {
- print_usage:
- com_err(0, 0, "Usage: htree_dump [-l] file");
- goto errout;
- }
-
- if (argc == optind)
- ino = cwd;
- else
- ino = string_to_inode(argv[optind]);
- if (!ino)
+ if (common_inode_args_process(argc, argv, &ino, 0))
goto errout;
if (debugfs_read_inode(ino, &inode, argv[1]))
com_err(argv[0], 0, "Not a directory");
goto errout;
}
-
+
if ((inode.i_flags & EXT2_BTREE_FL) == 0) {
com_err(argv[0], 0, "Not a hash-indexed directory");
goto errout;
goto errout;
}
- errcode = io_channel_read_blk(current_fs->io, inode.i_block[0],
- 1, buf);
+ errcode = ext2fs_bmap2(current_fs, ino, &inode, buf, 0, 0, 0, &blk);
+ if (errcode) {
+ com_err("do_htree_block", errcode,
+ "while mapping logical block 0\n");
+ goto errout;
+ }
+
+ errcode = io_channel_read_blk64(current_fs->io, blk,
+ 1, buf);
if (errcode) {
com_err(argv[0], errcode, "Error reading root node");
goto errout;
rootnode->indirect_levels);
errout:
- if (buf)
- free(buf);
+ free(buf);
close_pager(pager);
}
int c;
int hash_version = 0;
__u32 hash_seed[4];
-
+
hash_seed[0] = hash_seed[1] = hash_seed[2] = hash_seed[3] = 0;
reset_getopt();
- while ((c = getopt (argc, argv, "h:")) != EOF) {
+ while ((c = getopt (argc, argv, "h:s:")) != EOF) {
switch (c) {
case 'h':
- hash_version = atoi(optarg);
+ hash_version = e2p_string2hash(optarg);
+ if (hash_version < 0)
+ hash_version = atoi(optarg);
+ break;
+ case 's':
+ if (uuid_parse(optarg, (unsigned char *) hash_seed)) {
+ fprintf(stderr, "Invalid UUID format: %s\n",
+ optarg);
+ return;
+ }
break;
default:
goto print_usage;
}
if (optind != argc-1) {
print_usage:
- com_err(argv[0], 0, "usage: dx_hash filename");
+ com_err(argv[0], 0, "usage: dx_hash [-h hash_alg] "
+ "[-s hash_seed] filename");
return;
}
err = ext2fs_dirhash(hash_version, argv[optind], strlen(argv[optind]),
int len;
};
-static int search_dir_block(ext2_filsys fs, blk_t *blocknr,
- e2_blkcnt_t blockcnt, blk_t ref_blk,
+static int search_dir_block(ext2_filsys fs, blk64_t *blocknr,
+ e2_blkcnt_t blockcnt, blk64_t ref_blk,
int ref_offset, void *priv_data);
void do_dirsearch(int argc, char *argv[])
{
ext2_ino_t inode;
struct process_block_struct pb;
-
+
if (check_fs_open(argv[0]))
return;
}
pb.search_name = argv[2];
pb.len = strlen(pb.search_name);
-
- ext2fs_block_iterate2(current_fs, inode, 0, 0, search_dir_block, &pb);
+
+ ext2fs_block_iterate3(current_fs, inode, BLOCK_FLAG_READ_ONLY, 0,
+ search_dir_block, &pb);
free(pb.buf);
}
-static int search_dir_block(ext2_filsys fs, blk_t *blocknr,
- e2_blkcnt_t blockcnt,
- blk_t ref_blk EXT2FS_ATTR((unused)),
+static int search_dir_block(ext2_filsys fs, blk64_t *blocknr,
+ e2_blkcnt_t blockcnt,
+ blk64_t ref_blk EXT2FS_ATTR((unused)),
int ref_offset EXT2FS_ATTR((unused)),
void *priv_data)
{
struct ext2_dir_entry *dirent;
errcode_t errcode;
unsigned int offset = 0;
+ unsigned int rec_len;
if (blockcnt < 0)
return 0;
p = (struct process_block_struct *) priv_data;
- errcode = io_channel_read_blk(current_fs->io, *blocknr, 1, p->buf);
+ errcode = io_channel_read_blk64(current_fs->io, *blocknr, 1, p->buf);
if (errcode) {
com_err("search_dir_block", errcode,
"while reading block %lu", (unsigned long) *blocknr);
while (offset < fs->blocksize) {
dirent = (struct ext2_dir_entry *) (p->buf + offset);
-
+ errcode = ext2fs_get_rec_len(fs, dirent, &rec_len);
+ if (errcode) {
+ com_err("htree_dump_leaf_inode", errcode,
+ "while getting rec_len for block %lu",
+ (unsigned long) *blocknr);
+ return BLOCK_ABORT;
+ }
if (dirent->inode &&
- p->len == (dirent->name_len & 0xFF) &&
+ p->len == (dirent->name_len & 0xFF) &&
strncmp(p->search_name, dirent->name,
p->len) == 0) {
printf("Entry found at logical block %lld, "
- "phys %u, offset %u\n", (long long)blockcnt,
+ "phys %llu, offset %u\n", (long long)blockcnt,
*blocknr, offset);
printf("offset %u\n", offset);
return BLOCK_ABORT;
}
- offset += dirent->rec_len;
+ offset += rec_len;
}
return 0;
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff