X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fsck.c;h=68e31078892e08edcd4fc7e193b5ebdbd9ccf54f;hp=b5e4fdbe16e0fc593e303de69de8e521b845ed31;hb=72411ed086a2209cab6c942bb8fe412a54124ec0;hpb=a00170132c28eeea61033d820c22e8d48d35a0fd

diff --git a/fsck.c b/fsck.c
index b5e4fdb..68e3107 100644
--- a/fsck.c
+++ b/fsck.c
@@ -15,7 +15,7 @@
 #include "log.h"
 #include "osl.h"
 #include "error.h"
-#include "fd.h"
+#include "util.h"
 #include "osl_core.h"
 #include "fsck.cmdline.h"
 
@@ -222,6 +222,72 @@ static inline int __fchdir(int fd)
 	return 1;
 }
 
+/**
+ * Wrapper for chdir(2).
+ *
+ * \param path The specified directory.
+ *
+ * \return Standard.
+ */
+_static_inline_ int __chdir(const char *path)
+{
+	if (chdir(path) >= 0)
+		return 1;
+	return -ERRNO_TO_ERROR(errno);
+}
+
+/**
+ * Save the cwd and open a given directory.
+ *
+ * \param dirname Path to the directory to open.
+ * \param dir Result pointer.
+ * \param cwd File descriptor of the current working directory.
+ *
+ * \return Standard.
+ *
+ * Opening the current directory (".") and calling fchdir() to return is
+ * usually faster and more reliable than saving cwd in some buffer and calling
+ * chdir() afterwards.
+ *
+ * If \a cwd is not \p NULL "." is opened and the resulting file descriptor is
+ * stored in \a cwd. If the function returns success, and \a cwd is not \p
+ * NULL, the caller must close this file descriptor (probably after calling
+ * fchdir(*cwd)).
+ *
+ * On errors, the function undos everything, so the caller needs neither close
+ * any files, nor change back to the original working directory.
+ *
+ * \sa getcwd(3).
+ *
+ */
+static int fsck_opendir(const char *dirname, DIR **dir, int *cwd)
+{
+	int ret;
+
+	if (cwd) {
+		ret = osl_open(".", O_RDONLY, 0);
+		if (ret < 0)
+			return ret;
+		*cwd = ret;
+	}
+	ret = __chdir(dirname);
+	if (ret < 0)
+		goto close_cwd;
+	*dir = opendir(".");
+	if (*dir)
+		return 1;
+	ret = -ERRNO_TO_ERROR(errno);
+/* Ignore return value of fchdir() and close(). We're busted anyway. */
+	if (cwd)
+		fchdir(*cwd);
+close_cwd:
+	if (cwd)
+		close(*cwd);
+	return ret;
+}
+
+
+
 /**
  * Traverse the given directory recursively.
  *
@@ -241,7 +307,7 @@ static int for_each_file_in_dir(const char *dirname,
 {
 	DIR *dir;
 	struct dirent *entry;
-	int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
+	int cwd_fd, ret2, ret = fsck_opendir(dirname, &dir, &cwd_fd);
 
 	if (ret < 0)
 		return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret;
@@ -341,13 +407,8 @@ static int check_index_ranges(struct osl_table *t)
 				continue;
 			ret = check_range(t, i, j);
 			if (ret < 0) {
-				if (ret != -E_OSL_INVALID_OBJECT &&
-						ret != -E_FSCK_RANGE_VIOLATION)
+				if (ret != -E_FSCK_RANGE_VIOLATION)
 					goto err;
-				if (ret == -E_OSL_INVALID_OBJECT) {
-					CRIT_LOG("row %d, col %d maps to an "
-						"invalid object\n", i, j);
-				}
 				ret = mark_row_invalid(t, i);
 				if (ret < 0)
 					goto err;
@@ -451,14 +512,9 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes)
 		for (j = 0; j < t->num_rows; j++) {
 			struct osl_object obj;
 			ret = get_mapped_object(t, i, j, &obj);
-			if (ret >= 0) {
-				loss[i] -= obj.size + 1; /* add one for header byte */
-				continue;
-			}
-			if (ret != -E_OSL_INVALID_OBJECT)
+			if (ret < 0)
 				goto err;
-			CRIT_LOG("row %d, col %d points to an invalid "
-				"mapped object, bad\n", j, i);
+			loss[i] -= obj.size;
 		}
 	}
 	ret = 0;
@@ -688,7 +744,7 @@ static unsigned files_pruned;
 int prune_disk_storage_file(const char *path, void *private_data)
 {
 	HASH_TYPE hash[HASH_SIZE];
-	unsigned flags = *(unsigned *)private_data;
+	uint8_t flags = *(uint8_t *)private_data;
 	struct osl_object obj = {.data = hash, .size = HASH_SIZE};
 	struct osl_row *row;
 	int ret = -1;
@@ -745,8 +801,9 @@ static int prune_disk_storage_files(struct osl_table *t)
 	INFO_LOG("looking for unreferenced disk storage files\n");
 	FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
 		char *dirname = column_filename(t, i);
+		uint8_t flags = t->desc->flags;
 		ret = for_each_file_in_dir(dirname, prune_disk_storage_file,
-			(unsigned *)&t->desc->flags);
+			&flags);
 		free(dirname);
 	}
 	if (files_pruned)
@@ -1119,7 +1176,7 @@ static int check_all_tables(char *db_dir)
 {
 	DIR *dir;
 	struct dirent *entry;
-	int cwd_fd, ret2, ret = para_opendir(db_dir, &dir, &cwd_fd);
+	int cwd_fd, ret2, ret = fsck_opendir(db_dir, &dir, &cwd_fd);
 
 	if (ret < 0)
 		return ret;