X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=e2fsck%2Fdirinfo.c;h=9873e385402555853af04f1dfa54582fd128a900;hb=f590d7143b89ef33b1719595ac55785ad6d90bd7;hp=101ccee7d35e654a4375c2be9207af5bc7e6e244;hpb=3839e65723771b85975f4263102dd3ceec4523c0;p=tools%2Fe2fsprogs.git

diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c
index 101ccee..9873e38 100644
--- a/e2fsck/dirinfo.c
+++ b/e2fsck/dirinfo.c
@@ -5,52 +5,171 @@
  * under the terms of the GNU Public License.
  */
 
-#include <et/com_err.h>
+#undef DIRINFO_DEBUG
+
+#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 int		dir_info_count = 0;
-static int		dir_info_size = 0;
-static struct dir_info	*dir_info = 0;
+static void e2fsck_put_dir_info(e2fsck_t ctx, struct dir_info *dir);
 
-int get_num_dirs(ext2_filsys fs)
+#ifdef CONFIG_TDB
+static void setup_tdb(e2fsck_t ctx, ext2_ino_t num_dirs)
 {
-	int	i, 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;
 
-	num_dirs = 0;
-	for (i = 0; i < fs->group_desc_count; i++)
-		num_dirs += fs->group_desc[i].bg_used_dirs_count;
+	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);
 
-	return num_dirs;
+	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 stash away the block
- * numbers for the directory, which we will need later.  The idea is
- * to avoid reading directory inodes twice.
+ * 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 add_dir_info(ext2_filsys fs, ino_t ino, ino_t parent,
-		struct ext2_inode *inode)
+void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent)
 {
-	struct dir_info *dir;
-	int	i, j;
+	struct dir_info		*dir, *old_array;
+	ext2_ino_t		i, j;
+	errcode_t		retval;
+	unsigned long		old_size;
 
-#if 0
-	printf("add_dir_info for inode %d...\n", ino);
+#ifdef DIRINFO_DEBUG
+	printf("add_dir_info for inode (%u, %u)...\n", ino, parent);
 #endif
-	if (!dir_info) {
-		dir_info_count = 0;
-		dir_info_size = get_num_dirs(fs) + 10;
+	if (!ctx->dir_info)
+		setup_db(ctx);
 
-		dir_info  = allocate_memory(dir_info_size *
-					   sizeof (struct dir_info),
-					   "directory map");
+	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;
 	}
-	
-	if (dir_info_count >= dir_info_size) {
-		dir_info_size += 10;
-		dir_info = realloc(dir_info,
-				  dir_info_size * sizeof(struct dir_info));
+
+#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
 
 	/*
 	 * Normally, add_dir_info is called with each inode in
@@ -61,17 +180,18 @@ void add_dir_info(ext2_filsys fs, ino_t ino, ino_t parent,
 	 * the dir_info array needs to be sorted by inode number for
 	 * get_dir_info()'s sake.
 	 */
-	if (dir_info_count && dir_info[dir_info_count-1].ino > ino) {
-		for (i = dir_info_count-1; i > 0; i--)
-			if (dir_info[i-1].ino < ino)
+	if (ctx->dir_info->count &&
+	    ctx->dir_info->array[ctx->dir_info->count-1].ino >= ino) {
+		for (i = ctx->dir_info->count-1; i > 0; i--)
+			if (ctx->dir_info->array[i-1].ino < ino)
 				break;
-		dir = &dir_info[i];
-		if (dir->ino != ino) 
-			for (j = dir_info_count++; j > i; j--)
-				dir_info[j] = dir_info[j-1];
+		dir = &ctx->dir_info->array[i];
+		if (dir->ino != ino)
+			for (j = ctx->dir_info->count++; j > i; j--)
+				ctx->dir_info->array[j] = ctx->dir_info->array[j-1];
 	} else
-		dir = &dir_info[dir_info_count++];
-	
+		dir = &ctx->dir_info->array[ctx->dir_info->count++];
+
 	dir->ino = ino;
 	dir->dotdot = parent;
 	dir->parent = parent;
@@ -81,24 +201,83 @@ void add_dir_info(ext2_filsys fs, ino_t ino, ino_t parent,
  * get_dir_info() --- given an inode number, try to find the directory
  * information entry for it.
  */
-struct dir_info *get_dir_info(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 low, high, mid;
+
+	if (!db)
+		return 0;
+
+#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;
+	}
+#endif
+
+	if (db->last_lookup && db->last_lookup->ino == ino)
+		return db->last_lookup;
 
 	low = 0;
-	high = dir_info_count-1;
-	if (ino == dir_info[low].ino)
-		return &dir_info[low];
-	if  (ino == dir_info[high].ino)
-		return &dir_info[high];
+	high = ctx->dir_info->count - 1;
+	if (ino == ctx->dir_info->array[low].ino) {
+#ifdef DIRINFO_DEBUG
+		printf("(%u,%u,%u)\n", ino,
+		       ctx->dir_info->array[low].dotdot,
+		       ctx->dir_info->array[low].parent);
+#endif
+		return &ctx->dir_info->array[low];
+	}
+	if (ino == ctx->dir_info->array[high].ino) {
+#ifdef DIRINFO_DEBUG
+		printf("(%u,%u,%u)\n", ino,
+		       ctx->dir_info->array[high].dotdot,
+		       ctx->dir_info->array[high].parent);
+#endif
+		return &ctx->dir_info->array[high];
+	}
 
 	while (low < high) {
-		mid = (low+high)/2;
+		/* sum may overflow, but result will fit into mid again */
+		mid = (unsigned long long)(low + high) / 2;
 		if (mid == low || mid == high)
 			break;
-		if (ino == dir_info[mid].ino)
-			return &dir_info[mid];
-		if (ino < dir_info[mid].ino)
+		if (ino == ctx->dir_info->array[mid].ino) {
+#ifdef DIRINFO_DEBUG
+			printf("(%u,%u,%u)\n", ino,
+			       ctx->dir_info->array[mid].dotdot,
+			       ctx->dir_info->array[mid].parent);
+#endif
+			return &ctx->dir_info->array[mid];
+		}
+		if (ino < ctx->dir_info->array[mid].ino)
 			high = mid;
 		else
 			low = mid;
@@ -106,15 +285,205 @@ struct dir_info *get_dir_info(ino_t ino)
 	return 0;
 }
 
+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
+}
+
 /*
  * Free the dir_info structure when it isn't needed any more.
  */
-void free_dir_info(ext2_filsys fs)
+void e2fsck_free_dir_info(e2fsck_t ctx)
 {
-	if (dir_info) {
-		free(dir_info);
-		dir_info = 0;
+	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;
 	}
-	dir_info_size = 0;
-	dir_info_count = 0;
 }
+
+/*
+ * Return the count of number of directories in the dir_info structure
+ */
+int e2fsck_get_num_dirinfo(e2fsck_t ctx)
+{
+	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 iterator function
+ */
+struct dir_info *e2fsck_dir_info_iter(e2fsck_t ctx, struct dir_info_iter *iter)
+{
+	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;
+
+#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;
+}
+