1190 lines
31 KiB
C
1190 lines
31 KiB
C
/*
|
|
* rehash.c --- rebuild hash tree directories
|
|
*
|
|
* Copyright (C) 2002 Theodore Ts'o
|
|
*
|
|
* %Begin-Header%
|
|
* This file may be redistributed under the terms of the GNU Public
|
|
* License.
|
|
* %End-Header%
|
|
*
|
|
* This algorithm is designed for simplicity of implementation and to
|
|
* pack the directory as much as possible. It however requires twice
|
|
* as much memory as the size of the directory. The maximum size
|
|
* directory supported using a 4k blocksize is roughly a gigabyte, and
|
|
* so there may very well be problems with machines that don't have
|
|
* virtual memory, and obscenely large directories.
|
|
*
|
|
* An alternate algorithm which is much more disk intensive could be
|
|
* written, and probably will need to be written in the future. The
|
|
* design goals of such an algorithm are: (a) use (roughly) constant
|
|
* amounts of memory, no matter how large the directory, (b) the
|
|
* directory must be safe at all times, even if e2fsck is interrupted
|
|
* in the middle, (c) we must use minimal amounts of extra disk
|
|
* blocks. This pretty much requires an incremental approach, where
|
|
* we are reading from one part of the directory, and inserting into
|
|
* the front half. So the algorithm will have to keep track of a
|
|
* moving block boundary between the new tree and the old tree, and
|
|
* files will need to be moved from the old directory and inserted
|
|
* into the new tree. If the new directory requires space which isn't
|
|
* yet available, blocks from the beginning part of the old directory
|
|
* may need to be moved to the end of the directory to make room for
|
|
* the new tree:
|
|
*
|
|
* --------------------------------------------------------
|
|
* | new tree | | old tree |
|
|
* --------------------------------------------------------
|
|
* ^ ptr ^ptr
|
|
* tail new head old
|
|
*
|
|
* This is going to be a pain in the tuckus to implement, and will
|
|
* require a lot more disk accesses. So I'm going to skip it for now;
|
|
* it's only really going to be an issue for really, really big
|
|
* filesystems (when we reach the level of tens of millions of files
|
|
* in a single directory). It will probably be easier to simply
|
|
* require that e2fsck use VM first.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include "e2fsck.h"
|
|
#include "problem.h"
|
|
#include "support/sort_r.h"
|
|
|
|
/* Schedule a dir to be rebuilt during pass 3A. */
|
|
void e2fsck_rehash_dir_later(e2fsck_t ctx, ext2_ino_t ino)
|
|
{
|
|
if (!ctx->dirs_to_hash)
|
|
ext2fs_u32_list_create(&ctx->dirs_to_hash, 50);
|
|
if (ctx->dirs_to_hash)
|
|
ext2fs_u32_list_add(ctx->dirs_to_hash, ino);
|
|
}
|
|
|
|
/* Ask if a dir will be rebuilt during pass 3A. */
|
|
int e2fsck_dir_will_be_rehashed(e2fsck_t ctx, ext2_ino_t ino)
|
|
{
|
|
if (ctx->options & E2F_OPT_COMPRESS_DIRS)
|
|
return 1;
|
|
if (!ctx->dirs_to_hash)
|
|
return 0;
|
|
return ext2fs_u32_list_test(ctx->dirs_to_hash, ino);
|
|
}
|
|
|
|
#undef REHASH_DEBUG
|
|
|
|
struct fill_dir_struct {
|
|
char *buf;
|
|
struct ext2_inode *inode;
|
|
ext2_ino_t ino;
|
|
errcode_t err;
|
|
e2fsck_t ctx;
|
|
struct hash_entry *harray;
|
|
blk_t max_array, num_array;
|
|
ext2_off64_t dir_size;
|
|
int compress;
|
|
ext2_ino_t parent;
|
|
ext2_ino_t dir;
|
|
};
|
|
|
|
struct hash_entry {
|
|
ext2_dirhash_t hash;
|
|
ext2_dirhash_t minor_hash;
|
|
ext2_ino_t ino;
|
|
struct ext2_dir_entry *dir;
|
|
};
|
|
|
|
struct out_dir {
|
|
blk_t num;
|
|
blk_t max;
|
|
char *buf;
|
|
ext2_dirhash_t *hashes;
|
|
};
|
|
|
|
#define DOTDOT_OFFSET 12
|
|
|
|
static int is_fake_entry(ext2_filsys fs, int lblk, unsigned int offset)
|
|
{
|
|
/* Entries in the first block before this value refer to . or .. */
|
|
if (lblk == 0 && offset <= DOTDOT_OFFSET)
|
|
return 1;
|
|
/* Check if this is likely the csum entry */
|
|
if (ext2fs_has_feature_metadata_csum(fs->super) &&
|
|
(offset & (fs->blocksize - 1)) ==
|
|
fs->blocksize - sizeof(struct ext2_dir_entry_tail))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
static int fill_dir_block(ext2_filsys fs,
|
|
blk64_t *block_nr,
|
|
e2_blkcnt_t blockcnt,
|
|
blk64_t ref_block EXT2FS_ATTR((unused)),
|
|
int ref_offset EXT2FS_ATTR((unused)),
|
|
void *priv_data)
|
|
{
|
|
struct fill_dir_struct *fd = (struct fill_dir_struct *) priv_data;
|
|
struct hash_entry *ent;
|
|
struct ext2_dir_entry *dirent;
|
|
char *dir;
|
|
unsigned int offset, dir_offset, rec_len, name_len;
|
|
int hash_alg, hash_flags, hash_in_entry;
|
|
|
|
if (blockcnt < 0)
|
|
return 0;
|
|
|
|
offset = blockcnt * fs->blocksize;
|
|
if (offset + fs->blocksize > fd->inode->i_size) {
|
|
fd->err = EXT2_ET_DIR_CORRUPTED;
|
|
return BLOCK_ABORT;
|
|
}
|
|
|
|
dir = (fd->buf+offset);
|
|
if (*block_nr == 0) {
|
|
memset(dir, 0, fs->blocksize);
|
|
dirent = (struct ext2_dir_entry *) dir;
|
|
(void) ext2fs_set_rec_len(fs, fs->blocksize, dirent);
|
|
} else {
|
|
int flags = fs->flags;
|
|
fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
|
|
fd->err = ext2fs_read_dir_block4(fs, *block_nr, dir, 0,
|
|
fd->dir);
|
|
fs->flags = (flags & EXT2_FLAG_IGNORE_CSUM_ERRORS) |
|
|
(fs->flags & ~EXT2_FLAG_IGNORE_CSUM_ERRORS);
|
|
if (fd->err)
|
|
return BLOCK_ABORT;
|
|
}
|
|
hash_flags = fd->inode->i_flags & EXT4_CASEFOLD_FL;
|
|
hash_in_entry = ext4_hash_in_dirent(fd->inode);
|
|
hash_alg = fs->super->s_def_hash_version;
|
|
if ((hash_alg <= EXT2_HASH_TEA) &&
|
|
(fs->super->s_flags & EXT2_FLAGS_UNSIGNED_HASH))
|
|
hash_alg += 3;
|
|
/* While the directory block is "hot", index it. */
|
|
dir_offset = 0;
|
|
while (dir_offset < fs->blocksize) {
|
|
unsigned int min_rec = EXT2_DIR_ENTRY_HEADER_LEN;
|
|
int extended = hash_in_entry && !is_fake_entry(fs, blockcnt, dir_offset);
|
|
|
|
if (extended)
|
|
min_rec += EXT2_DIR_ENTRY_HASH_LEN;
|
|
dirent = (struct ext2_dir_entry *) (dir + dir_offset);
|
|
(void) ext2fs_get_rec_len(fs, dirent, &rec_len);
|
|
name_len = ext2fs_dirent_name_len(dirent);
|
|
if (((dir_offset + rec_len) > fs->blocksize) ||
|
|
(rec_len < min_rec) ||
|
|
((rec_len % 4) != 0) ||
|
|
(name_len + min_rec > rec_len)) {
|
|
fd->err = EXT2_ET_DIR_CORRUPTED;
|
|
return BLOCK_ABORT;
|
|
}
|
|
dir_offset += rec_len;
|
|
if (dirent->inode == 0)
|
|
continue;
|
|
if ((name_len) == 0) {
|
|
fd->err = EXT2_ET_DIR_CORRUPTED;
|
|
return BLOCK_ABORT;
|
|
}
|
|
if (!fd->compress && (name_len == 1) &&
|
|
(dirent->name[0] == '.'))
|
|
continue;
|
|
if (!fd->compress && (name_len == 2) &&
|
|
(dirent->name[0] == '.') && (dirent->name[1] == '.')) {
|
|
fd->parent = dirent->inode;
|
|
continue;
|
|
}
|
|
if (fd->num_array >= fd->max_array) {
|
|
errcode_t retval;
|
|
|
|
retval = ext2fs_resize_array(sizeof(struct hash_entry),
|
|
fd->max_array,
|
|
fd->max_array + 500,
|
|
&fd->harray);
|
|
if (retval) {
|
|
fd->err = retval;
|
|
return BLOCK_ABORT;
|
|
}
|
|
fd->max_array += 500;
|
|
}
|
|
ent = fd->harray + fd->num_array++;
|
|
ent->dir = dirent;
|
|
fd->dir_size += ext2fs_dir_rec_len(name_len, extended);
|
|
ent->ino = dirent->inode;
|
|
if (extended) {
|
|
ent->hash = EXT2_DIRENT_HASH(dirent);
|
|
ent->minor_hash = EXT2_DIRENT_MINOR_HASH(dirent);
|
|
} else if (fd->compress) {
|
|
ent->hash = ent->minor_hash = 0;
|
|
} else {
|
|
fd->err = ext2fs_dirhash2(hash_alg,
|
|
dirent->name, name_len,
|
|
fs->encoding, hash_flags,
|
|
fs->super->s_hash_seed,
|
|
&ent->hash, &ent->minor_hash);
|
|
if (fd->err)
|
|
return BLOCK_ABORT;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Used for sorting the hash entry */
|
|
static EXT2_QSORT_TYPE ino_cmp(const void *a, const void *b)
|
|
{
|
|
const struct hash_entry *he_a = (const struct hash_entry *) a;
|
|
const struct hash_entry *he_b = (const struct hash_entry *) b;
|
|
|
|
return (he_a->ino - he_b->ino);
|
|
}
|
|
|
|
struct name_cmp_ctx
|
|
{
|
|
int casefold;
|
|
const struct ext2fs_nls_table *tbl;
|
|
};
|
|
|
|
static int same_name(const struct name_cmp_ctx *cmp_ctx, char *s1,
|
|
int len1, char *s2, int len2)
|
|
{
|
|
if (!cmp_ctx->casefold)
|
|
return (len1 == len2 && !memcmp(s1, s2, len1));
|
|
else
|
|
return !ext2fs_casefold_cmp(cmp_ctx->tbl,
|
|
(unsigned char *) s1, len1,
|
|
(unsigned char *) s2, len2);
|
|
}
|
|
|
|
/* Used for sorting the hash entry */
|
|
static EXT2_QSORT_TYPE name_cmp(const void *a, const void *b)
|
|
{
|
|
const struct hash_entry *he_a = (const struct hash_entry *) a;
|
|
const struct hash_entry *he_b = (const struct hash_entry *) b;
|
|
unsigned int he_a_len, he_b_len, min_len;
|
|
int ret;
|
|
|
|
he_a_len = ext2fs_dirent_name_len(he_a->dir);
|
|
he_b_len = ext2fs_dirent_name_len(he_b->dir);
|
|
min_len = he_a_len;
|
|
if (min_len > he_b_len)
|
|
min_len = he_b_len;
|
|
|
|
ret = memcmp(he_a->dir->name, he_b->dir->name, min_len);
|
|
if (ret == 0) {
|
|
if (he_a_len > he_b_len)
|
|
ret = 1;
|
|
else if (he_a_len < he_b_len)
|
|
ret = -1;
|
|
else
|
|
ret = he_b->dir->inode - he_a->dir->inode;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static EXT2_QSORT_TYPE name_cf_cmp(const struct name_cmp_ctx *ctx,
|
|
const void *a, const void *b)
|
|
{
|
|
const struct hash_entry *he_a = (const struct hash_entry *) a;
|
|
const struct hash_entry *he_b = (const struct hash_entry *) b;
|
|
unsigned int he_a_len, he_b_len;
|
|
int ret;
|
|
|
|
he_a_len = ext2fs_dirent_name_len(he_a->dir);
|
|
he_b_len = ext2fs_dirent_name_len(he_b->dir);
|
|
|
|
ret = ext2fs_casefold_cmp(ctx->tbl,
|
|
(unsigned char *) he_a->dir->name, he_a_len,
|
|
(unsigned char *) he_b->dir->name, he_b_len);
|
|
if (ret == 0) {
|
|
if (he_a_len > he_b_len)
|
|
ret = 1;
|
|
else if (he_a_len < he_b_len)
|
|
ret = -1;
|
|
else
|
|
ret = he_b->dir->inode - he_a->dir->inode;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/* Used for sorting the hash entry */
|
|
static EXT2_QSORT_TYPE hash_cmp(const void *a, const void *b, void *arg)
|
|
{
|
|
const struct name_cmp_ctx *ctx = (struct name_cmp_ctx *) arg;
|
|
const struct hash_entry *he_a = (const struct hash_entry *) a;
|
|
const struct hash_entry *he_b = (const struct hash_entry *) b;
|
|
int ret;
|
|
|
|
if (he_a->hash > he_b->hash)
|
|
ret = 1;
|
|
else if (he_a->hash < he_b->hash)
|
|
ret = -1;
|
|
else {
|
|
if (he_a->minor_hash > he_b->minor_hash)
|
|
ret = 1;
|
|
else if (he_a->minor_hash < he_b->minor_hash)
|
|
ret = -1;
|
|
else {
|
|
if (ctx->casefold)
|
|
ret = name_cf_cmp(ctx, a, b);
|
|
else
|
|
ret = name_cmp(a, b);
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static errcode_t alloc_size_dir(ext2_filsys fs, struct out_dir *outdir,
|
|
blk_t blocks)
|
|
{
|
|
errcode_t retval;
|
|
|
|
if (outdir->max) {
|
|
retval = ext2fs_resize_array(fs->blocksize, outdir->max, blocks,
|
|
&outdir->buf);
|
|
if (retval)
|
|
return retval;
|
|
retval = ext2fs_resize_array(sizeof(ext2_dirhash_t),
|
|
outdir->max, blocks,
|
|
&outdir->hashes);
|
|
if (retval)
|
|
return retval;
|
|
} else {
|
|
retval = ext2fs_get_array(fs->blocksize, blocks, &outdir->buf);
|
|
if (retval)
|
|
return retval;
|
|
retval = ext2fs_get_array(sizeof(ext2_dirhash_t), blocks,
|
|
&outdir->hashes);
|
|
if (retval)
|
|
return retval;
|
|
outdir->num = 0;
|
|
}
|
|
outdir->max = blocks;
|
|
return 0;
|
|
}
|
|
|
|
static void free_out_dir(struct out_dir *outdir)
|
|
{
|
|
free(outdir->buf);
|
|
free(outdir->hashes);
|
|
outdir->max = 0;
|
|
outdir->num =0;
|
|
}
|
|
|
|
static errcode_t get_next_block(ext2_filsys fs, struct out_dir *outdir,
|
|
char ** ret)
|
|
{
|
|
errcode_t retval;
|
|
|
|
if (outdir->num >= outdir->max) {
|
|
int increment = outdir->max / 10;
|
|
|
|
if (increment < 50)
|
|
increment = 50;
|
|
retval = alloc_size_dir(fs, outdir, outdir->max + increment);
|
|
if (retval)
|
|
return retval;
|
|
}
|
|
*ret = outdir->buf + (size_t)outdir->num++ * fs->blocksize;
|
|
memset(*ret, 0, fs->blocksize);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This function is used to make a unique filename. We do this by
|
|
* appending ~0, and then incrementing the number. However, we cannot
|
|
* expand the length of the filename beyond the padding available in
|
|
* the directory entry.
|
|
*/
|
|
static void mutate_name(char *str, unsigned int *len)
|
|
{
|
|
int i;
|
|
unsigned int l = *len;
|
|
|
|
/*
|
|
* First check to see if it looks the name has been mutated
|
|
* already
|
|
*/
|
|
for (i = l-1; i > 0; i--) {
|
|
if (!isdigit(str[i]))
|
|
break;
|
|
}
|
|
if ((i == (int)l - 1) || (str[i] != '~')) {
|
|
if (((l-1) & 3) < 2)
|
|
l += 2;
|
|
else
|
|
l = (l+3) & ~3;
|
|
if (l > 255)
|
|
l = 255;
|
|
str[l-2] = '~';
|
|
str[l-1] = '0';
|
|
*len = l;
|
|
return;
|
|
}
|
|
for (i = l-1; i >= 0; i--) {
|
|
if (isdigit(str[i])) {
|
|
if (str[i] == '9')
|
|
str[i] = '0';
|
|
else {
|
|
str[i]++;
|
|
return;
|
|
}
|
|
continue;
|
|
}
|
|
if (i == 1) {
|
|
if (str[0] == 'z')
|
|
str[0] = 'A';
|
|
else if (str[0] == 'Z') {
|
|
str[0] = '~';
|
|
str[1] = '0';
|
|
} else
|
|
str[0]++;
|
|
} else if (i > 0) {
|
|
str[i] = '1';
|
|
str[i-1] = '~';
|
|
} else {
|
|
if (str[0] == '~')
|
|
str[0] = 'a';
|
|
else
|
|
str[0]++;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
static int duplicate_search_and_fix(e2fsck_t ctx, ext2_filsys fs,
|
|
ext2_ino_t ino,
|
|
struct fill_dir_struct *fd,
|
|
const struct name_cmp_ctx *cmp_ctx)
|
|
{
|
|
struct problem_context pctx;
|
|
struct hash_entry *ent, *prev;
|
|
blk_t i, j;
|
|
int fixed = 0;
|
|
char new_name[256];
|
|
unsigned int new_len;
|
|
int hash_alg;
|
|
int hash_flags = fd->inode->i_flags & EXT4_CASEFOLD_FL;
|
|
|
|
clear_problem_context(&pctx);
|
|
pctx.ino = ino;
|
|
|
|
hash_alg = fs->super->s_def_hash_version;
|
|
if ((hash_alg <= EXT2_HASH_TEA) &&
|
|
(fs->super->s_flags & EXT2_FLAGS_UNSIGNED_HASH))
|
|
hash_alg += 3;
|
|
|
|
for (i=1; i < fd->num_array; i++) {
|
|
ent = fd->harray + i;
|
|
prev = ent - 1;
|
|
if (!ent->dir->inode ||
|
|
!same_name(cmp_ctx, ent->dir->name,
|
|
ext2fs_dirent_name_len(ent->dir),
|
|
prev->dir->name,
|
|
ext2fs_dirent_name_len(prev->dir)))
|
|
continue;
|
|
pctx.dirent = ent->dir;
|
|
if ((ent->dir->inode == prev->dir->inode) &&
|
|
fix_problem(ctx, PR_2_DUPLICATE_DIRENT, &pctx)) {
|
|
e2fsck_adjust_inode_count(ctx, ent->dir->inode, -1);
|
|
ent->dir->inode = 0;
|
|
fixed++;
|
|
continue;
|
|
}
|
|
/* Can't alter encrypted name without key, so just drop it */
|
|
if (fd->inode->i_flags & EXT4_ENCRYPT_FL) {
|
|
if (fix_problem(ctx, PR_2_NON_UNIQUE_FILE_NO_RENAME, &pctx)) {
|
|
e2fsck_adjust_inode_count(ctx, ent->dir->inode, -1);
|
|
ent->dir->inode = 0;
|
|
fixed++;
|
|
continue;
|
|
}
|
|
}
|
|
new_len = ext2fs_dirent_name_len(ent->dir);
|
|
if (new_len == 0) {
|
|
/* should never happen */
|
|
ext2fs_unmark_valid(fs);
|
|
continue;
|
|
}
|
|
memcpy(new_name, ent->dir->name, new_len);
|
|
mutate_name(new_name, &new_len);
|
|
for (j=0; j < fd->num_array; j++) {
|
|
if ((i==j) ||
|
|
!same_name(cmp_ctx, new_name, new_len,
|
|
fd->harray[j].dir->name,
|
|
ext2fs_dirent_name_len(fd->harray[j].dir))) {
|
|
continue;
|
|
}
|
|
mutate_name(new_name, &new_len);
|
|
|
|
j = -1;
|
|
}
|
|
new_name[new_len] = 0;
|
|
pctx.str = new_name;
|
|
if (fix_problem(ctx, PR_2_NON_UNIQUE_FILE, &pctx)) {
|
|
memcpy(ent->dir->name, new_name, new_len);
|
|
ext2fs_dirent_set_name_len(ent->dir, new_len);
|
|
ext2fs_dirhash2(hash_alg, new_name, new_len,
|
|
fs->encoding, hash_flags,
|
|
fs->super->s_hash_seed,
|
|
&ent->hash, &ent->minor_hash);
|
|
fixed++;
|
|
}
|
|
}
|
|
return fixed;
|
|
}
|
|
|
|
|
|
static errcode_t copy_dir_entries(e2fsck_t ctx,
|
|
struct fill_dir_struct *fd,
|
|
struct out_dir *outdir)
|
|
{
|
|
ext2_filsys fs = ctx->fs;
|
|
errcode_t retval;
|
|
char *block_start;
|
|
struct hash_entry *ent;
|
|
struct ext2_dir_entry *dirent;
|
|
unsigned int rec_len, prev_rec_len, left, slack, offset;
|
|
blk_t i;
|
|
ext2_dirhash_t prev_hash;
|
|
int csum_size = 0;
|
|
struct ext2_dir_entry_tail *t;
|
|
int hash_in_entry = ext4_hash_in_dirent(fd->inode);
|
|
unsigned int min_rec_len = ext2fs_dir_rec_len(1, hash_in_entry);
|
|
|
|
if (ctx->htree_slack_percentage == 255) {
|
|
profile_get_uint(ctx->profile, "options",
|
|
"indexed_dir_slack_percentage",
|
|
0, 20,
|
|
&ctx->htree_slack_percentage);
|
|
if (ctx->htree_slack_percentage > 100)
|
|
ctx->htree_slack_percentage = 20;
|
|
}
|
|
|
|
if (ext2fs_has_feature_metadata_csum(fs->super))
|
|
csum_size = sizeof(struct ext2_dir_entry_tail);
|
|
|
|
outdir->max = 0;
|
|
retval = alloc_size_dir(fs, outdir,
|
|
(fd->dir_size / fs->blocksize) + 2);
|
|
if (retval)
|
|
return retval;
|
|
outdir->num = fd->compress ? 0 : 1;
|
|
offset = 0;
|
|
outdir->hashes[0] = 0;
|
|
prev_hash = 1;
|
|
if ((retval = get_next_block(fs, outdir, &block_start)))
|
|
return retval;
|
|
dirent = (struct ext2_dir_entry *) block_start;
|
|
prev_rec_len = 0;
|
|
rec_len = 0;
|
|
left = fs->blocksize - csum_size;
|
|
slack = fd->compress ? min_rec_len :
|
|
((fs->blocksize - csum_size) * ctx->htree_slack_percentage)/100;
|
|
if (slack < min_rec_len)
|
|
slack = min_rec_len;
|
|
for (i = 0; i < fd->num_array; i++) {
|
|
ent = fd->harray + i;
|
|
if (ent->dir->inode == 0)
|
|
continue;
|
|
rec_len = ext2fs_dir_rec_len(ext2fs_dirent_name_len(ent->dir),
|
|
hash_in_entry);
|
|
if (rec_len > left) {
|
|
if (left) {
|
|
left += prev_rec_len;
|
|
retval = ext2fs_set_rec_len(fs, left, dirent);
|
|
if (retval)
|
|
return retval;
|
|
}
|
|
if (csum_size) {
|
|
t = EXT2_DIRENT_TAIL(block_start,
|
|
fs->blocksize);
|
|
ext2fs_initialize_dirent_tail(fs, t);
|
|
}
|
|
if ((retval = get_next_block(fs, outdir,
|
|
&block_start)))
|
|
return retval;
|
|
offset = 0;
|
|
}
|
|
left = (fs->blocksize - csum_size) - offset;
|
|
dirent = (struct ext2_dir_entry *) (block_start + offset);
|
|
if (offset == 0) {
|
|
if (ent->hash == prev_hash)
|
|
outdir->hashes[outdir->num-1] = ent->hash | 1;
|
|
else
|
|
outdir->hashes[outdir->num-1] = ent->hash;
|
|
}
|
|
dirent->inode = ent->dir->inode;
|
|
ext2fs_dirent_set_name_len(dirent,
|
|
ext2fs_dirent_name_len(ent->dir));
|
|
ext2fs_dirent_set_file_type(dirent,
|
|
ext2fs_dirent_file_type(ent->dir));
|
|
retval = ext2fs_set_rec_len(fs, rec_len, dirent);
|
|
if (retval)
|
|
return retval;
|
|
prev_rec_len = rec_len;
|
|
memcpy(dirent->name, ent->dir->name,
|
|
ext2fs_dirent_name_len(dirent));
|
|
if (hash_in_entry) {
|
|
EXT2_DIRENT_HASHES(dirent)->hash = ext2fs_cpu_to_le32(ent->hash);
|
|
EXT2_DIRENT_HASHES(dirent)->minor_hash =
|
|
ext2fs_cpu_to_le32(ent->minor_hash);
|
|
}
|
|
offset += rec_len;
|
|
left -= rec_len;
|
|
if (left < slack) {
|
|
prev_rec_len += left;
|
|
retval = ext2fs_set_rec_len(fs, prev_rec_len, dirent);
|
|
if (retval)
|
|
return retval;
|
|
offset += left;
|
|
left = 0;
|
|
}
|
|
prev_hash = ent->hash;
|
|
}
|
|
if (left)
|
|
retval = ext2fs_set_rec_len(fs, rec_len + left, dirent);
|
|
if (csum_size) {
|
|
t = EXT2_DIRENT_TAIL(block_start, fs->blocksize);
|
|
ext2fs_initialize_dirent_tail(fs, t);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
static struct ext2_dx_root_info *set_root_node(ext2_filsys fs, char *buf,
|
|
ext2_ino_t ino, ext2_ino_t parent,
|
|
struct ext2_inode *inode)
|
|
{
|
|
struct ext2_dir_entry *dir;
|
|
struct ext2_dx_root_info *root;
|
|
struct ext2_dx_countlimit *limits;
|
|
int filetype = 0;
|
|
int csum_size = 0;
|
|
|
|
if (ext2fs_has_feature_filetype(fs->super))
|
|
filetype = EXT2_FT_DIR;
|
|
|
|
memset(buf, 0, fs->blocksize);
|
|
dir = (struct ext2_dir_entry *) buf;
|
|
dir->inode = ino;
|
|
dir->name[0] = '.';
|
|
ext2fs_dirent_set_name_len(dir, 1);
|
|
ext2fs_dirent_set_file_type(dir, filetype);
|
|
dir->rec_len = 12;
|
|
dir = (struct ext2_dir_entry *) (buf + 12);
|
|
dir->inode = parent;
|
|
dir->name[0] = '.';
|
|
dir->name[1] = '.';
|
|
ext2fs_dirent_set_name_len(dir, 2);
|
|
ext2fs_dirent_set_file_type(dir, filetype);
|
|
dir->rec_len = fs->blocksize - 12;
|
|
|
|
root = (struct ext2_dx_root_info *) (buf+24);
|
|
root->reserved_zero = 0;
|
|
if (ext4_hash_in_dirent(inode))
|
|
root->hash_version = EXT2_HASH_SIPHASH;
|
|
else
|
|
root->hash_version = fs->super->s_def_hash_version;
|
|
root->info_length = 8;
|
|
root->indirect_levels = 0;
|
|
root->unused_flags = 0;
|
|
|
|
if (ext2fs_has_feature_metadata_csum(fs->super))
|
|
csum_size = sizeof(struct ext2_dx_tail);
|
|
|
|
limits = (struct ext2_dx_countlimit *) (buf+32);
|
|
limits->limit = (fs->blocksize - (32 + csum_size)) /
|
|
sizeof(struct ext2_dx_entry);
|
|
limits->count = 0;
|
|
|
|
return root;
|
|
}
|
|
|
|
|
|
static struct ext2_dx_entry *set_int_node(ext2_filsys fs, char *buf)
|
|
{
|
|
struct ext2_dir_entry *dir;
|
|
struct ext2_dx_countlimit *limits;
|
|
int csum_size = 0;
|
|
|
|
memset(buf, 0, fs->blocksize);
|
|
dir = (struct ext2_dir_entry *) buf;
|
|
dir->inode = 0;
|
|
(void) ext2fs_set_rec_len(fs, fs->blocksize, dir);
|
|
|
|
if (ext2fs_has_feature_metadata_csum(fs->super))
|
|
csum_size = sizeof(struct ext2_dx_tail);
|
|
|
|
limits = (struct ext2_dx_countlimit *) (buf+8);
|
|
limits->limit = (fs->blocksize - (8 + csum_size)) /
|
|
sizeof(struct ext2_dx_entry);
|
|
limits->count = 0;
|
|
|
|
return (struct ext2_dx_entry *) limits;
|
|
}
|
|
|
|
static int alloc_blocks(ext2_filsys fs,
|
|
struct ext2_dx_countlimit **limit,
|
|
struct ext2_dx_entry **prev_ent,
|
|
struct ext2_dx_entry **next_ent,
|
|
int *prev_offset, int *next_offset,
|
|
struct out_dir *outdir, int i,
|
|
int *prev_count, int *next_count)
|
|
{
|
|
errcode_t retval;
|
|
char *block_start;
|
|
|
|
if (*limit)
|
|
(*limit)->limit = (*limit)->count =
|
|
ext2fs_cpu_to_le16((*limit)->limit);
|
|
*prev_ent = (struct ext2_dx_entry *) (outdir->buf + *prev_offset);
|
|
(*prev_ent)->block = ext2fs_cpu_to_le32(outdir->num);
|
|
|
|
if (i != 1)
|
|
(*prev_ent)->hash =
|
|
ext2fs_cpu_to_le32(outdir->hashes[i]);
|
|
|
|
retval = get_next_block(fs, outdir, &block_start);
|
|
if (retval)
|
|
return retval;
|
|
|
|
/* outdir->buf might be reallocated */
|
|
*prev_ent = (struct ext2_dx_entry *) (outdir->buf + *prev_offset);
|
|
|
|
*next_ent = set_int_node(fs, block_start);
|
|
*limit = (struct ext2_dx_countlimit *)(*next_ent);
|
|
if (next_offset)
|
|
*next_offset = ((char *) *next_ent - outdir->buf);
|
|
|
|
*next_count = (*limit)->limit;
|
|
(*prev_offset) += sizeof(struct ext2_dx_entry);
|
|
(*prev_count)--;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This function takes the leaf nodes which have been written in
|
|
* outdir, and populates the root node and any necessary interior nodes.
|
|
*/
|
|
static errcode_t calculate_tree(ext2_filsys fs,
|
|
struct out_dir *outdir,
|
|
ext2_ino_t ino,
|
|
ext2_ino_t parent,
|
|
struct ext2_inode *inode)
|
|
{
|
|
struct ext2_dx_root_info *root_info;
|
|
struct ext2_dx_entry *root, *int_ent, *dx_ent = 0;
|
|
struct ext2_dx_countlimit *root_limit, *int_limit, *limit;
|
|
errcode_t retval;
|
|
int i, c1, c2, c3, nblks;
|
|
int limit_offset, int_offset, root_offset;
|
|
|
|
root_info = set_root_node(fs, outdir->buf, ino, parent, inode);
|
|
root_offset = limit_offset = ((char *) root_info - outdir->buf) +
|
|
root_info->info_length;
|
|
root_limit = (struct ext2_dx_countlimit *) (outdir->buf + limit_offset);
|
|
c1 = root_limit->limit;
|
|
nblks = outdir->num;
|
|
|
|
/* Write out the pointer blocks */
|
|
if (nblks - 1 <= c1) {
|
|
/* Just write out the root block, and we're done */
|
|
root = (struct ext2_dx_entry *) (outdir->buf + root_offset);
|
|
for (i=1; i < nblks; i++) {
|
|
root->block = ext2fs_cpu_to_le32(i);
|
|
if (i != 1)
|
|
root->hash =
|
|
ext2fs_cpu_to_le32(outdir->hashes[i]);
|
|
root++;
|
|
c1--;
|
|
}
|
|
} else if (nblks - 1 <= ext2fs_htree_intnode_maxrecs(fs, c1)) {
|
|
c2 = 0;
|
|
limit = NULL;
|
|
root_info->indirect_levels = 1;
|
|
for (i=1; i < nblks; i++) {
|
|
if (c2 == 0 && c1 == 0)
|
|
return ENOSPC;
|
|
if (c2 == 0) {
|
|
retval = alloc_blocks(fs, &limit, &root,
|
|
&dx_ent, &root_offset,
|
|
NULL, outdir, i, &c1,
|
|
&c2);
|
|
if (retval)
|
|
return retval;
|
|
}
|
|
dx_ent->block = ext2fs_cpu_to_le32(i);
|
|
if (c2 != limit->limit)
|
|
dx_ent->hash =
|
|
ext2fs_cpu_to_le32(outdir->hashes[i]);
|
|
dx_ent++;
|
|
c2--;
|
|
}
|
|
limit->count = ext2fs_cpu_to_le16(limit->limit - c2);
|
|
limit->limit = ext2fs_cpu_to_le16(limit->limit);
|
|
} else {
|
|
c2 = 0;
|
|
c3 = 0;
|
|
limit = NULL;
|
|
int_limit = 0;
|
|
root_info->indirect_levels = 2;
|
|
for (i = 1; i < nblks; i++) {
|
|
if (c3 == 0 && c2 == 0 && c1 == 0)
|
|
return ENOSPC;
|
|
if (c3 == 0 && c2 == 0) {
|
|
retval = alloc_blocks(fs, &int_limit, &root,
|
|
&int_ent, &root_offset,
|
|
&int_offset, outdir, i,
|
|
&c1, &c2);
|
|
if (retval)
|
|
return retval;
|
|
}
|
|
if (c3 == 0) {
|
|
int delta1 = (char *)int_limit - outdir->buf;
|
|
int delta2 = (char *)root - outdir->buf;
|
|
|
|
retval = alloc_blocks(fs, &limit, &int_ent,
|
|
&dx_ent, &int_offset,
|
|
NULL, outdir, i, &c2,
|
|
&c3);
|
|
if (retval)
|
|
return retval;
|
|
|
|
/* outdir->buf might be reallocated */
|
|
int_limit = (struct ext2_dx_countlimit *)
|
|
(outdir->buf + delta1);
|
|
root = (struct ext2_dx_entry *)
|
|
(outdir->buf + delta2);
|
|
}
|
|
dx_ent->block = ext2fs_cpu_to_le32(i);
|
|
if (c3 != limit->limit)
|
|
dx_ent->hash =
|
|
ext2fs_cpu_to_le32(outdir->hashes[i]);
|
|
dx_ent++;
|
|
c3--;
|
|
}
|
|
int_limit->count = ext2fs_cpu_to_le16(limit->limit - c2);
|
|
int_limit->limit = ext2fs_cpu_to_le16(limit->limit);
|
|
|
|
limit->count = ext2fs_cpu_to_le16(limit->limit - c3);
|
|
limit->limit = ext2fs_cpu_to_le16(limit->limit);
|
|
|
|
}
|
|
root_limit = (struct ext2_dx_countlimit *) (outdir->buf + limit_offset);
|
|
root_limit->count = ext2fs_cpu_to_le16(root_limit->limit - c1);
|
|
root_limit->limit = ext2fs_cpu_to_le16(root_limit->limit);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct write_dir_struct {
|
|
struct out_dir *outdir;
|
|
errcode_t err;
|
|
ext2_ino_t ino;
|
|
e2fsck_t ctx;
|
|
ext2_ino_t dir;
|
|
};
|
|
|
|
/*
|
|
* Helper function which writes out a directory block.
|
|
*/
|
|
static int write_dir_block(ext2_filsys fs,
|
|
blk64_t *block_nr,
|
|
e2_blkcnt_t blockcnt,
|
|
blk64_t ref_block EXT2FS_ATTR((unused)),
|
|
int ref_offset EXT2FS_ATTR((unused)),
|
|
void *priv_data)
|
|
{
|
|
struct write_dir_struct *wd = (struct write_dir_struct *) priv_data;
|
|
char *dir, *buf = 0;
|
|
|
|
#ifdef REHASH_DEBUG
|
|
printf("%u: write_dir_block %lld:%lld", wd->ino, blockcnt, *block_nr);
|
|
#endif
|
|
if ((*block_nr == 0) || (blockcnt < 0)) {
|
|
#ifdef REHASH_DEBUG
|
|
printf(" - skip\n");
|
|
#endif
|
|
return 0;
|
|
}
|
|
if (blockcnt < wd->outdir->num)
|
|
dir = wd->outdir->buf + (blockcnt * fs->blocksize);
|
|
else if (wd->ctx->lost_and_found == wd->dir) {
|
|
/* Don't release any extra directory blocks for lost+found */
|
|
wd->err = ext2fs_new_dir_block(fs, 0, 0, &buf);
|
|
if (wd->err)
|
|
return BLOCK_ABORT;
|
|
dir = buf;
|
|
wd->outdir->num++;
|
|
} else {
|
|
/* Don't free blocks at the end of the directory, they
|
|
* will be truncated by the caller. */
|
|
#ifdef REHASH_DEBUG
|
|
printf(" - not freed\n");
|
|
#endif
|
|
return 0;
|
|
}
|
|
wd->err = ext2fs_write_dir_block4(fs, *block_nr, dir, 0, wd->dir);
|
|
if (buf)
|
|
ext2fs_free_mem(&buf);
|
|
|
|
#ifdef REHASH_DEBUG
|
|
printf(" - write (%d)\n", wd->err);
|
|
#endif
|
|
if (wd->err)
|
|
return BLOCK_ABORT;
|
|
return 0;
|
|
}
|
|
|
|
static errcode_t write_directory(e2fsck_t ctx, ext2_filsys fs,
|
|
struct out_dir *outdir,
|
|
ext2_ino_t ino, struct ext2_inode *inode,
|
|
int compress)
|
|
{
|
|
struct write_dir_struct wd;
|
|
errcode_t retval;
|
|
|
|
retval = e2fsck_expand_directory(ctx, ino, -1, outdir->num);
|
|
if (retval)
|
|
return retval;
|
|
|
|
wd.outdir = outdir;
|
|
wd.err = 0;
|
|
wd.ino = ino;
|
|
wd.ctx = ctx;
|
|
wd.dir = ino;
|
|
|
|
retval = ext2fs_block_iterate3(fs, ino, 0, NULL,
|
|
write_dir_block, &wd);
|
|
if (retval)
|
|
return retval;
|
|
if (wd.err)
|
|
return wd.err;
|
|
|
|
e2fsck_read_inode(ctx, ino, inode, "rehash_dir");
|
|
if (compress)
|
|
inode->i_flags &= ~EXT2_INDEX_FL;
|
|
else
|
|
inode->i_flags |= EXT2_INDEX_FL;
|
|
#ifdef REHASH_DEBUG
|
|
printf("%u: set inode size to %u blocks = %u bytes\n",
|
|
ino, outdir->num, outdir->num * fs->blocksize);
|
|
#endif
|
|
retval = ext2fs_inode_size_set(fs, inode, (ext2_off64_t)outdir->num *
|
|
fs->blocksize);
|
|
if (retval)
|
|
return retval;
|
|
|
|
/* ext2fs_punch() calls ext2fs_write_inode() which writes the size */
|
|
return ext2fs_punch(fs, ino, inode, NULL, outdir->num, ~0ULL);
|
|
}
|
|
|
|
errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino,
|
|
struct problem_context *pctx)
|
|
{
|
|
ext2_filsys fs = ctx->fs;
|
|
errcode_t retval;
|
|
struct ext2_inode inode;
|
|
char *dir_buf = 0;
|
|
struct fill_dir_struct fd = { NULL, NULL, 0, 0, 0, NULL,
|
|
0, 0, 0, 0, 0, 0 };
|
|
struct out_dir outdir = { 0, 0, 0, 0 };
|
|
struct name_cmp_ctx name_cmp_ctx = {0, NULL};
|
|
|
|
e2fsck_read_inode(ctx, ino, &inode, "rehash_dir");
|
|
|
|
if (ext2fs_has_feature_inline_data(fs->super) &&
|
|
(inode.i_flags & EXT4_INLINE_DATA_FL))
|
|
return 0;
|
|
|
|
retval = ext2fs_get_mem(inode.i_size, &dir_buf);
|
|
if (retval)
|
|
goto errout;
|
|
|
|
fd.max_array = inode.i_size / 32;
|
|
retval = ext2fs_get_array(sizeof(struct hash_entry),
|
|
fd.max_array, &fd.harray);
|
|
if (retval)
|
|
goto errout;
|
|
|
|
fd.ino = ino;
|
|
fd.ctx = ctx;
|
|
fd.buf = dir_buf;
|
|
fd.inode = &inode;
|
|
fd.dir = ino;
|
|
if (!ext2fs_has_feature_dir_index(fs->super) ||
|
|
(inode.i_size / fs->blocksize) < 2)
|
|
fd.compress = 1;
|
|
fd.parent = 0;
|
|
|
|
if (fs->encoding && (inode.i_flags & EXT4_CASEFOLD_FL)) {
|
|
name_cmp_ctx.casefold = 1;
|
|
name_cmp_ctx.tbl = fs->encoding;
|
|
}
|
|
|
|
retry_nohash:
|
|
/* Read in the entire directory into memory */
|
|
retval = ext2fs_block_iterate3(fs, ino, 0, 0,
|
|
fill_dir_block, &fd);
|
|
if (fd.err) {
|
|
retval = fd.err;
|
|
goto errout;
|
|
}
|
|
|
|
/*
|
|
* If the entries read are less than a block, then don't index
|
|
* the directory
|
|
*/
|
|
if (!fd.compress && (fd.dir_size < (fs->blocksize - 24))) {
|
|
fd.compress = 1;
|
|
fd.dir_size = 0;
|
|
fd.num_array = 0;
|
|
goto retry_nohash;
|
|
}
|
|
|
|
#if 0
|
|
printf("%d entries (%d bytes) found in inode %d\n",
|
|
fd.num_array, fd.dir_size, ino);
|
|
#endif
|
|
|
|
/* Sort the list */
|
|
resort:
|
|
if (fd.compress && fd.num_array > 1)
|
|
sort_r(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
|
|
hash_cmp, &name_cmp_ctx);
|
|
else
|
|
sort_r(fd.harray, fd.num_array, sizeof(struct hash_entry),
|
|
hash_cmp, &name_cmp_ctx);
|
|
|
|
/*
|
|
* Look for duplicates
|
|
*/
|
|
if (duplicate_search_and_fix(ctx, fs, ino, &fd, &name_cmp_ctx))
|
|
goto resort;
|
|
|
|
if (ctx->options & E2F_OPT_NO) {
|
|
retval = 0;
|
|
goto errout;
|
|
}
|
|
|
|
/* Sort non-hashed directories by inode number */
|
|
if (fd.compress && fd.num_array > 1)
|
|
qsort(fd.harray+2, fd.num_array-2,
|
|
sizeof(struct hash_entry), ino_cmp);
|
|
|
|
/*
|
|
* Copy the directory entries. In a htree directory these
|
|
* will become the leaf nodes.
|
|
*/
|
|
retval = copy_dir_entries(ctx, &fd, &outdir);
|
|
if (retval)
|
|
goto errout;
|
|
|
|
free(dir_buf); dir_buf = 0;
|
|
|
|
if (!fd.compress) {
|
|
/* Calculate the interior nodes */
|
|
retval = calculate_tree(fs, &outdir, ino, fd.parent, fd.inode);
|
|
if (retval)
|
|
goto errout;
|
|
}
|
|
|
|
retval = write_directory(ctx, fs, &outdir, ino, &inode, fd.compress);
|
|
if (retval)
|
|
goto errout;
|
|
|
|
if (ctx->options & E2F_OPT_CONVERT_BMAP)
|
|
retval = e2fsck_rebuild_extents_later(ctx, ino);
|
|
else
|
|
retval = e2fsck_check_rebuild_extents(ctx, ino, &inode, pctx);
|
|
errout:
|
|
ext2fs_free_mem(&dir_buf);
|
|
ext2fs_free_mem(&fd.harray);
|
|
|
|
free_out_dir(&outdir);
|
|
return retval;
|
|
}
|
|
|
|
void e2fsck_rehash_directories(e2fsck_t ctx)
|
|
{
|
|
struct problem_context pctx;
|
|
#ifdef RESOURCE_TRACK
|
|
struct resource_track rtrack;
|
|
#endif
|
|
struct dir_info *dir;
|
|
ext2_u32_iterate iter;
|
|
struct dir_info_iter * dirinfo_iter = 0;
|
|
ext2_ino_t ino;
|
|
errcode_t retval;
|
|
int cur, max, all_dirs, first = 1;
|
|
|
|
init_resource_track(&rtrack, ctx->fs->io);
|
|
all_dirs = ctx->options & E2F_OPT_COMPRESS_DIRS;
|
|
|
|
if (!ctx->dirs_to_hash && !all_dirs)
|
|
return;
|
|
|
|
(void) e2fsck_get_lost_and_found(ctx, 0);
|
|
|
|
clear_problem_context(&pctx);
|
|
|
|
cur = 0;
|
|
if (all_dirs) {
|
|
dirinfo_iter = e2fsck_dir_info_iter_begin(ctx);
|
|
max = e2fsck_get_num_dirinfo(ctx);
|
|
} else {
|
|
retval = ext2fs_u32_list_iterate_begin(ctx->dirs_to_hash,
|
|
&iter);
|
|
if (retval) {
|
|
pctx.errcode = retval;
|
|
fix_problem(ctx, PR_3A_OPTIMIZE_ITER, &pctx);
|
|
return;
|
|
}
|
|
max = ext2fs_u32_list_count(ctx->dirs_to_hash);
|
|
}
|
|
while (1) {
|
|
if (all_dirs) {
|
|
if ((dir = e2fsck_dir_info_iter(ctx,
|
|
dirinfo_iter)) == 0)
|
|
break;
|
|
ino = dir->ino;
|
|
} else {
|
|
if (!ext2fs_u32_list_iterate(iter, &ino))
|
|
break;
|
|
}
|
|
if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino))
|
|
continue;
|
|
|
|
pctx.dir = ino;
|
|
if (first) {
|
|
fix_problem(ctx, PR_3A_PASS_HEADER, &pctx);
|
|
first = 0;
|
|
}
|
|
#if 0
|
|
fix_problem(ctx, PR_3A_OPTIMIZE_DIR, &pctx);
|
|
#endif
|
|
pctx.errcode = e2fsck_rehash_dir(ctx, ino, &pctx);
|
|
if (pctx.errcode) {
|
|
end_problem_latch(ctx, PR_LATCH_OPTIMIZE_DIR);
|
|
fix_problem(ctx, PR_3A_OPTIMIZE_DIR_ERR, &pctx);
|
|
}
|
|
if (ctx->progress && !ctx->progress_fd)
|
|
e2fsck_simple_progress(ctx, "Rebuilding directory",
|
|
100.0 * (float) (++cur) / (float) max, ino);
|
|
}
|
|
end_problem_latch(ctx, PR_LATCH_OPTIMIZE_DIR);
|
|
if (all_dirs)
|
|
e2fsck_dir_info_iter_end(ctx, dirinfo_iter);
|
|
else
|
|
ext2fs_u32_list_iterate_end(iter);
|
|
|
|
if (ctx->dirs_to_hash)
|
|
ext2fs_u32_list_free(ctx->dirs_to_hash);
|
|
ctx->dirs_to_hash = 0;
|
|
|
|
print_resource_track(ctx, "Pass 3A", &rtrack, ctx->fs->io);
|
|
}
|