* under the terms of the GNU Public License.
*/
+#undef DIRINFO_DEBUG
+
+#include <assert.h>
+#include "config.h"
#include "e2fsck.h"
+#include <sys/stat.h>
+#include <fcntl.h>
+#include "uuid/uuid.h"
+
+#include "ext2fs/ext2fs.h"
+#include <ext2fs/tdb.h>
+
+struct dir_info_db {
+ ext2_ino_t count;
+ ext2_ino_t size;
+ struct dir_info *array;
+ struct dir_info *last_lookup;
+#ifdef CONFIG_TDB
+ char *tdb_fn;
+ TDB_CONTEXT *tdb;
+#endif
+};
+
+struct dir_info_iter {
+ ext2_ino_t i;
+#ifdef CONFIG_TDB
+ TDB_DATA tdb_iter;
+#endif
+};
+
+struct dir_info_ent {
+ ext2_ino_t dotdot; /* Parent according to '..' */
+ ext2_ino_t parent; /* Parent according to treewalk */
+};
+
+
+static void e2fsck_put_dir_info(e2fsck_t ctx, struct dir_info *dir);
+
+#ifdef CONFIG_TDB
+static void setup_tdb(e2fsck_t ctx, ext2_ino_t num_dirs)
+{
+ struct dir_info_db *db = ctx->dir_info;
+ ext2_ino_t threshold;
+ errcode_t retval;
+ mode_t save_umask;
+ char *tdb_dir, uuid[40];
+ int fd, enable;
+
+ profile_get_string(ctx->profile, "scratch_files", "directory", 0, 0,
+ &tdb_dir);
+ profile_get_uint(ctx->profile, "scratch_files",
+ "numdirs_threshold", 0, 0, &threshold);
+ profile_get_boolean(ctx->profile, "scratch_files",
+ "dirinfo", 0, 1, &enable);
+
+ if (!enable || !tdb_dir || access(tdb_dir, W_OK) ||
+ (threshold && num_dirs <= threshold))
+ return;
+
+ retval = ext2fs_get_mem(strlen(tdb_dir) + 64, &db->tdb_fn);
+ if (retval)
+ return;
+
+ uuid_unparse(ctx->fs->super->s_uuid, uuid);
+ sprintf(db->tdb_fn, "%s/%s-dirinfo-XXXXXX", tdb_dir, uuid);
+ save_umask = umask(077);
+ fd = mkstemp(db->tdb_fn);
+ umask(save_umask);
+ if (fd < 0) {
+ db->tdb = NULL;
+ return;
+ }
+
+ if (num_dirs < 99991)
+ num_dirs = 99991; /* largest 5 digit prime */
+
+ db->tdb = tdb_open(db->tdb_fn, num_dirs, TDB_NOLOCK | TDB_NOSYNC,
+ O_RDWR | O_CREAT | O_TRUNC, 0600);
+ close(fd);
+}
+#endif
+
+static void setup_db(e2fsck_t ctx)
+{
+ struct dir_info_db *db;
+ ext2_ino_t num_dirs;
+ errcode_t retval;
+
+ db = (struct dir_info_db *)
+ e2fsck_allocate_memory(ctx, sizeof(struct dir_info_db),
+ "directory map db");
+ db->count = db->size = 0;
+ db->array = 0;
+
+ ctx->dir_info = db;
+
+ retval = ext2fs_get_num_dirs(ctx->fs, &num_dirs);
+ if (retval)
+ num_dirs = 1024; /* Guess */
+
+#ifdef CONFIG_TDB
+ setup_tdb(ctx, num_dirs);
+
+ if (db->tdb) {
+#ifdef DIRINFO_DEBUG
+ printf("Note: using tdb!\n");
+#endif
+ return;
+ }
+#endif
+
+ db->size = num_dirs + 10;
+ db->array = (struct dir_info *)
+ e2fsck_allocate_memory(ctx, db->size
+ * sizeof (struct dir_info),
+ "directory map");
+}
/*
- * This subroutine is called during pass1 to create a directory info
- * entry. During pass1, the passed-in parent is 0; it will get filled
- * in during pass2.
+ * Return the min index that has ino larger or equal to @ino
+ * If not found, return -ENOENT
*/
-void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent)
+static int
+e2fsck_dir_info_min_larger_equal(struct dir_info_db *dir_info,
+ ext2_ino_t ino, ext2_ino_t *index)
{
- struct dir_info *dir;
- int i, j;
- ext2_ino_t num_dirs;
- errcode_t retval;
- unsigned long old_size;
-
-#if 0
- printf("add_dir_info for inode %lu...\n", ino);
-#endif
- if (!ctx->dir_info) {
- ctx->dir_info_count = 0;
- retval = ext2fs_get_num_dirs(ctx->fs, &num_dirs);
- if (retval)
- num_dirs = 1024; /* Guess */
- ctx->dir_info_size = num_dirs + 10;
- ctx->dir_info = (struct dir_info *)
- e2fsck_allocate_memory(ctx, ctx->dir_info_size
- * sizeof (struct dir_info),
- "directory map");
+ ext2_ino_t low = 0;
+ ext2_ino_t mid, high;
+ ext2_ino_t tmp_ino;
+ int found = 0;
+
+ if (dir_info->count == 0)
+ return -ENOENT;
+
+ high = dir_info->count - 1;
+ while (low <= high) {
+ /* sum may overflow, but result will fit into mid again */
+ mid = (unsigned long long)(low + high) / 2;
+ tmp_ino = dir_info->array[mid].ino;
+ if (ino == tmp_ino) {
+ *index = mid;
+ found = 1;
+ return 0;
+ } else if (ino < tmp_ino) {
+ /*
+ * The mid ino is larger than @ino, remember the index
+ * here so we won't miss this ino
+ */
+ *index = mid;
+ found = 1;
+ if (mid == 0)
+ break;
+ high = mid - 1;
+ } else {
+ low = mid + 1;
+ }
}
-
- if (ctx->dir_info_count >= ctx->dir_info_size) {
- old_size = ctx->dir_info_size * sizeof(struct dir_info);
- ctx->dir_info_size += 10;
- retval = ext2fs_resize_mem(old_size, ctx->dir_info_size *
- sizeof(struct dir_info),
- &ctx->dir_info);
- if (retval) {
- ctx->dir_info_size -= 10;
- return;
+
+ if (found)
+ return 0;
+
+ return -ENOENT;
+}
+
+/*
+ * Merge two sorted dir info to @dest
+ */
+void e2fsck_merge_dir_info(e2fsck_t ctx, struct dir_info_db *src,
+ struct dir_info_db *dest)
+{
+ size_t size_dir_info = sizeof(struct dir_info);
+ ext2_ino_t size = dest->size;
+ struct dir_info *src_array = src->array;
+ struct dir_info *dest_array = dest->array;
+ ext2_ino_t src_count = src->count;
+ ext2_ino_t dest_count = dest->count;
+ ext2_ino_t total_count = src_count + dest_count;
+ struct dir_info *tmp_array;
+ struct dir_info *array_ptr;
+ ext2_ino_t src_index = 0;
+ ext2_ino_t dest_index = 0;
+
+ if (src->count == 0)
+ return;
+
+ if (size < total_count)
+ size = total_count;
+
+ if (size < src->size)
+ size = src->size;
+
+ tmp_array = e2fsck_allocate_memory(ctx, size * size_dir_info,
+ "directory map");
+ array_ptr = tmp_array;
+ /*
+ * This can be improved by binary search and memcpy, but codes
+ * would be more complex. And if the groups distributed to each
+ * thread are strided, this implementation won't be too bad
+ * comparing to the optimiztion.
+ */
+ while (src_index < src_count || dest_index < dest_count) {
+ if (src_index >= src_count) {
+ memcpy(array_ptr, &dest_array[dest_index],
+ (dest_count - dest_index) * size_dir_info);
+ break;
+ }
+ if (dest_index >= dest_count) {
+ memcpy(array_ptr, &src_array[src_index],
+ (src_count - src_index) * size_dir_info);
+ break;
+ }
+ if (src_array[src_index].ino < dest_array[dest_index].ino) {
+ *array_ptr = src_array[src_index];
+ src_index++;
+ } else {
+ assert(src_array[src_index].ino >
+ dest_array[dest_index].ino);
+ *array_ptr = dest_array[dest_index];
+ dest_index++;
}
+ array_ptr++;
}
+ if (dest->array)
+ ext2fs_free_mem(&dest->array);
+ dest->array = tmp_array;
+ dest->size = size;
+ dest->count = total_count;
+}
+
+/*
+ *
+ * Insert an inode into the sorted array. The array should have at least one
+ * free slot.
+ *
+ * Normally, add_dir_info is called with each inode in
+ * sequential order; but once in a while (like when pass 3
+ * needs to recreate the root directory or lost+found
+ * directory) it is called out of order. In those cases, we
+ * need to move the dir_info entries down to make room, since
+ * the dir_info array needs to be sorted by inode number for
+ * get_dir_info()'s sake.
+ */
+static void e2fsck_insert_dir_info(struct dir_info_db *dir_info, ext2_ino_t ino, ext2_ino_t parent)
+{
+ ext2_ino_t index;
+ struct dir_info *dir;
+ size_t dir_size = sizeof(*dir);
+ struct dir_info *array = dir_info->array;
+ ext2_ino_t array_count = dir_info->count;
+ int err;
+
/*
- * Normally, add_dir_info is called with each inode in
- * sequential order; but once in a while (like when pass 3
- * needs to recreate the root directory or lost+found
- * directory) it is called out of order. In those cases, we
- * need to move the dir_info entries down to make room, since
- * the dir_info array needs to be sorted by inode number for
- * get_dir_info()'s sake.
+ * Removing this check won't break anything. But since seqential ino
+ * inserting happens a lot, this check avoids binary search.
*/
- if (ctx->dir_info_count &&
- ctx->dir_info[ctx->dir_info_count-1].ino >= ino) {
- for (i = ctx->dir_info_count-1; i > 0; i--)
- if (ctx->dir_info[i-1].ino < ino)
- break;
- dir = &ctx->dir_info[i];
- if (dir->ino != ino)
- for (j = ctx->dir_info_count++; j > i; j--)
- ctx->dir_info[j] = ctx->dir_info[j-1];
- } else
- dir = &ctx->dir_info[ctx->dir_info_count++];
-
+ if (array_count == 0 || array[array_count - 1].ino < ino) {
+ dir = &array[array_count];
+ dir_info->count++;
+ goto out;
+ }
+
+ err = e2fsck_dir_info_min_larger_equal(dir_info, ino, &index);
+ if (err >= 0 && array[index].ino == ino) {
+ dir = &array[index];
+ goto out;
+ }
+ if (err < 0) {
+ dir = &array[array_count];
+ dir_info->count++;
+ goto out;
+ }
+
+ dir = &array[index];
+ memmove((char *)dir + dir_size, dir, dir_size * (array_count - index));
+ dir_info->count++;
+out:
dir->ino = ino;
dir->dotdot = parent;
dir->parent = parent;
}
/*
+ * This subroutine is called during pass1 to create a directory info
+ * entry. During pass1, the passed-in parent is 0; it will get filled
+ * in during pass2.
+ */
+void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent)
+{
+ struct dir_info *dir, *old_array;
+ ext2_ino_t i, j;
+ errcode_t retval;
+ unsigned long old_size;
+
+#ifdef DIRINFO_DEBUG
+ printf("add_dir_info for inode (%u, %u)...\n", ino, parent);
+#endif
+ if (!ctx->dir_info)
+ setup_db(ctx);
+
+ if (ctx->dir_info->count >= ctx->dir_info->size) {
+ old_size = ctx->dir_info->size * sizeof(struct dir_info);
+ ctx->dir_info->size += 10;
+ old_array = ctx->dir_info->array;
+ retval = ext2fs_resize_mem(old_size, ctx->dir_info->size *
+ sizeof(struct dir_info),
+ &ctx->dir_info->array);
+ if (retval) {
+ fprintf(stderr, "Couldn't reallocate dir_info "
+ "structure to %u entries\n",
+ ctx->dir_info->size);
+ fatal_error(ctx, 0);
+ ctx->dir_info->size -= 10;
+ return;
+ }
+ if (old_array != ctx->dir_info->array)
+ ctx->dir_info->last_lookup = NULL;
+ }
+
+#ifdef CONFIG_TDB
+ if (ctx->dir_info->tdb) {
+ struct dir_info ent;
+
+ ent.ino = ino;
+ ent.parent = parent;
+ ent.dotdot = parent;
+ e2fsck_put_dir_info(ctx, &ent);
+ return;
+ }
+#endif
+
+ e2fsck_insert_dir_info(ctx->dir_info, ino, parent);
+}
+
+/*
* get_dir_info() --- given an inode number, try to find the directory
* information entry for it.
*/
-struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ext2_ino_t ino)
+static struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ext2_ino_t ino)
{
- int low, high, mid;
+ struct dir_info_db *db = ctx->dir_info;
+ ext2_ino_t index;
+ int err;
- low = 0;
- high = ctx->dir_info_count-1;
- if (!ctx->dir_info)
+ if (!db)
return 0;
- if (ino == ctx->dir_info[low].ino)
- return &ctx->dir_info[low];
- if (ino == ctx->dir_info[high].ino)
- return &ctx->dir_info[high];
-
- while (low < high) {
- mid = (low+high)/2;
- if (mid == low || mid == high)
- break;
- if (ino == ctx->dir_info[mid].ino)
- return &ctx->dir_info[mid];
- if (ino < ctx->dir_info[mid].ino)
- high = mid;
- else
- low = mid;
+
+#ifdef DIRINFO_DEBUG
+ printf("e2fsck_get_dir_info %u...", ino);
+#endif
+
+#ifdef CONFIG_TDB
+ if (db->tdb) {
+ static struct dir_info ret_dir_info;
+ TDB_DATA key, data;
+ struct dir_info_ent *buf;
+
+ key.dptr = (unsigned char *) &ino;
+ key.dsize = sizeof(ext2_ino_t);
+
+ data = tdb_fetch(db->tdb, key);
+ if (!data.dptr) {
+ if (tdb_error(db->tdb) != TDB_ERR_NOEXIST)
+ printf("fetch failed: %s\n",
+ tdb_errorstr(db->tdb));
+ return 0;
+ }
+
+ buf = (struct dir_info_ent *) data.dptr;
+ ret_dir_info.ino = ino;
+ ret_dir_info.dotdot = buf->dotdot;
+ ret_dir_info.parent = buf->parent;
+#ifdef DIRINFO_DEBUG
+ printf("(%u,%u,%u)\n", ino, buf->dotdot, buf->parent);
+#endif
+ free(data.dptr);
+ return &ret_dir_info;
}
- return 0;
+#endif
+
+ if (db->last_lookup && db->last_lookup->ino == ino)
+ return db->last_lookup;
+
+ err = e2fsck_dir_info_min_larger_equal(ctx->dir_info, ino, &index);
+ if (err < 0)
+ return NULL;
+ assert(ino <= ctx->dir_info->array[index].ino);
+ if (ino == ctx->dir_info->array[index].ino) {
+#ifdef DIRINFO_DEBUG
+ printf("(%d,%d,%d)\n", ino,
+ ctx->dir_info->array[index].dotdot,
+ ctx->dir_info->array[index].parent);
+#endif
+ return &ctx->dir_info->array[index];
+ }
+ return NULL;
+}
+
+static void e2fsck_put_dir_info(e2fsck_t ctx EXT2FS_NO_TDB_UNUSED,
+ struct dir_info *dir EXT2FS_NO_TDB_UNUSED)
+{
+#ifdef CONFIG_TDB
+ struct dir_info_db *db = ctx->dir_info;
+ struct dir_info_ent buf;
+ TDB_DATA key, data;
+#endif
+
+#ifdef DIRINFO_DEBUG
+ printf("e2fsck_put_dir_info (%u, %u, %u)...", dir->ino, dir->dotdot,
+ dir->parent);
+#endif
+
+#ifdef CONFIG_TDB
+ if (!db->tdb)
+ return;
+
+ buf.parent = dir->parent;
+ buf.dotdot = dir->dotdot;
+
+ key.dptr = (unsigned char *) &dir->ino;
+ key.dsize = sizeof(ext2_ino_t);
+ data.dptr = (unsigned char *) &buf;
+ data.dsize = sizeof(buf);
+
+ if (tdb_store(db->tdb, key, data, TDB_REPLACE) == -1) {
+ printf("store failed: %s\n", tdb_errorstr(db->tdb));
+ }
+#endif
}
/*
void e2fsck_free_dir_info(e2fsck_t ctx)
{
if (ctx->dir_info) {
+#ifdef CONFIG_TDB
+ if (ctx->dir_info->tdb)
+ tdb_close(ctx->dir_info->tdb);
+ if (ctx->dir_info->tdb_fn) {
+ if (unlink(ctx->dir_info->tdb_fn) < 0)
+ com_err("e2fsck_free_dir_info", errno,
+ _("while freeing dir_info tdb file"));
+ ext2fs_free_mem(&ctx->dir_info->tdb_fn);
+ }
+#endif
+ if (ctx->dir_info->array)
+ ext2fs_free_mem(&ctx->dir_info->array);
+ ctx->dir_info->array = 0;
+ ctx->dir_info->size = 0;
+ ctx->dir_info->count = 0;
ext2fs_free_mem(&ctx->dir_info);
ctx->dir_info = 0;
}
- ctx->dir_info_size = 0;
- ctx->dir_info_count = 0;
}
/*
*/
int e2fsck_get_num_dirinfo(e2fsck_t ctx)
{
- return ctx->dir_info_count;
+ return ctx->dir_info ? ctx->dir_info->count : 0;
+}
+
+struct dir_info_iter *e2fsck_dir_info_iter_begin(e2fsck_t ctx)
+{
+ struct dir_info_iter *iter;
+
+ iter = e2fsck_allocate_memory(ctx, sizeof(struct dir_info_iter),
+ "dir_info iterator");
+
+#ifdef CONFIG_TDB
+ if (ctx->dir_info->tdb)
+ iter->tdb_iter = tdb_firstkey(ctx->dir_info->tdb);
+#endif
+
+ return iter;
+}
+
+void e2fsck_dir_info_iter_end(e2fsck_t ctx EXT2FS_ATTR((unused)),
+ struct dir_info_iter *iter)
+{
+#ifdef CONFIG_TDB
+ free(iter->tdb_iter.dptr);
+#endif
+ ext2fs_free_mem(&iter);
}
/*
* A simple interator function
*/
-struct dir_info *e2fsck_dir_info_iter(e2fsck_t ctx, int *control)
+struct dir_info *e2fsck_dir_info_iter(e2fsck_t ctx, struct dir_info_iter *iter)
{
- if (*control >= ctx->dir_info_count)
+ if (!ctx->dir_info || !iter)
+ return 0;
+
+#ifdef CONFIG_TDB
+ if (ctx->dir_info->tdb) {
+ static struct dir_info ret_dir_info;
+ struct dir_info_ent *buf;
+ TDB_DATA data, key;
+
+ if (iter->tdb_iter.dptr == 0)
+ return 0;
+ key = iter->tdb_iter;
+ data = tdb_fetch(ctx->dir_info->tdb, key);
+ if (!data.dptr) {
+ printf("iter fetch failed: %s\n",
+ tdb_errorstr(ctx->dir_info->tdb));
+ return 0;
+ }
+ buf = (struct dir_info_ent *) data.dptr;
+ ret_dir_info.ino = *((ext2_ino_t *) iter->tdb_iter.dptr);
+ ret_dir_info.dotdot = buf->dotdot;
+ ret_dir_info.parent = buf->parent;
+ iter->tdb_iter = tdb_nextkey(ctx->dir_info->tdb, key);
+ free(key.dptr);
+ free(data.dptr);
+ return &ret_dir_info;
+ }
+#endif
+
+ if (iter->i >= ctx->dir_info->count)
return 0;
- return(ctx->dir_info + (*control)++);
+#ifdef DIRINFO_DEBUG
+ printf("iter(%u, %u, %u)...", ctx->dir_info->array[iter->i].ino,
+ ctx->dir_info->array[iter->i].dotdot,
+ ctx->dir_info->array[iter->i].parent);
+#endif
+ ctx->dir_info->last_lookup = ctx->dir_info->array + iter->i++;
+ return(ctx->dir_info->last_lookup);
}
+
+/*
+ * This function only sets the parent pointer, and requires that
+ * dirinfo structure has already been created.
+ */
+int e2fsck_dir_info_set_parent(e2fsck_t ctx, ext2_ino_t ino,
+ ext2_ino_t parent)
+{
+ struct dir_info *p;
+
+ p = e2fsck_get_dir_info(ctx, ino);
+ if (!p)
+ return 1;
+ p->parent = parent;
+ e2fsck_put_dir_info(ctx, p);
+ return 0;
+}
+
+/*
+ * This function only sets the dot dot pointer, and requires that
+ * dirinfo structure has already been created.
+ */
+int e2fsck_dir_info_set_dotdot(e2fsck_t ctx, ext2_ino_t ino,
+ ext2_ino_t dotdot)
+{
+ struct dir_info *p;
+
+ p = e2fsck_get_dir_info(ctx, ino);
+ if (!p)
+ return 1;
+ p->dotdot = dotdot;
+ e2fsck_put_dir_info(ctx, p);
+ return 0;
+}
+
+/*
+ * This function only sets the parent pointer, and requires that
+ * dirinfo structure has already been created.
+ */
+int e2fsck_dir_info_get_parent(e2fsck_t ctx, ext2_ino_t ino,
+ ext2_ino_t *parent)
+{
+ struct dir_info *p;
+
+ p = e2fsck_get_dir_info(ctx, ino);
+ if (!p)
+ return 1;
+ *parent = p->parent;
+ return 0;
+}
+
+/*
+ * This function only sets the dot dot pointer, and requires that
+ * dirinfo structure has already been created.
+ */
+int e2fsck_dir_info_get_dotdot(e2fsck_t ctx, ext2_ino_t ino,
+ ext2_ino_t *dotdot)
+{
+ struct dir_info *p;
+
+ p = e2fsck_get_dir_info(ctx, ino);
+ if (!p)
+ return 1;
+ *dotdot = p->dotdot;
+ return 0;
+}
+
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff