X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=fsck.c;h=9701f277a60f6bd503e7600489d4b90b10779704;hp=29c4e2c7dc9d72d940dbb7c4298f24d84f3dcfc8;hb=952a0fe4afb455c8d719eb920b9e3983405af3ec;hpb=c1a4bb030717f2d2d209ccd8ab898ab66fa16869 diff --git a/fsck.c b/fsck.c index 29c4e2c..9701f27 100644 --- a/fsck.c +++ b/fsck.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -14,18 +14,16 @@ #include "log.h" #include "osl.h" -#include "error.h" #include "util.h" #include "osl_core.h" #include "fsck.cmdline.h" -/** version text used by various commands if -V switch was given */ -#define VERSION_TEXT(prefix) "osl_" prefix " " VERSION " " "\n" \ - "Copyright (C) 2008 Andre Noll\n" \ +#define VERSION_TEXT(prefix) "osl" prefix " " VERSION " " "\n" \ + "Copyright (C) 2008-2009 Andre Noll\n" \ "This is free software with ABSOLUTELY NO WARRANTY." \ " See COPYING for details.\n" \ "Written by Andre Noll.\n" \ - "Report bugs to .\n" + "Report bugs to .\n" /** print out \p VERSION_TEXT and exit if version flag was given */ #define HANDLE_VERSION_FLAG(_prefix, _args_info_struct) \ @@ -39,8 +37,12 @@ static struct fsck_args_info conf; #define FSCK_ERRORS \ FSCK_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \ FSCK_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \ - FSCK_ERROR(SYNTAX, "fsck syntax error"), + FSCK_ERROR(SYNTAX, "fsck syntax error"), \ + FSCK_ERROR(ACCESS, "permission denied"), \ + FSCK_ERROR(CHDIR, "could not change directory"), \ + FSCK_ERROR(OPENDIR, "could not open directory"), +#define FSCK_ERROR_BIT 29 #define FSCK_ERROR(num, txt) E_FSCK_ ## num enum { FSCK_DUMMY = (1 << FSCK_ERROR_BIT) - 1, @@ -48,7 +50,7 @@ enum { }; #undef FSCK_ERROR #define FSCK_ERROR(num, txt) txt -const char const *fsck_errors[] = { +static const char *fsck_errors[] = { FSCK_ERRORS }; @@ -62,7 +64,7 @@ static const char *fsck_strerror(int num) extern int loglevel; /* taken from git */ -signed char hexval_table[256] = { +static signed char hexval_table[256] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 00-07 */ -1, -1, -1, -1, -1, -1, -1, -1, /* 08-0f */ -1, -1, -1, -1, -1, -1, -1, -1, /* 10-17 */ @@ -97,7 +99,7 @@ signed char hexval_table[256] = { -1, -1, -1, -1, -1, -1, -1, -1, /* f8-ff */ }; -int asc_to_hash(const char *asc_hash, int len, HASH_TYPE *hash) +static int asc_to_hash(const char *asc_hash, int len, HASH_TYPE *hash) { int i = 0; const unsigned char *asc = (const unsigned char *) asc_hash; @@ -118,8 +120,8 @@ static int _write_all(int fd, const char *buf, size_t len) return write_all(fd, buf, &len); } -/** - * Paraslash's version of malloc(). +/* + * Wrapper for malloc(). * * \param size The desired new size. * @@ -144,7 +146,7 @@ __must_check __malloc static void *fsck_malloc(size_t size) } /** - * Paraslash's version of calloc(). + * Allocate memory and fill with zeros. * * \param size The desired new size. * @@ -164,7 +166,7 @@ __must_check __malloc static void *fsck_calloc(size_t size) } /** - * Paraslash's version of strdup(). + * Save version of strdup(). * * \param s The string to be duplicated. * @@ -217,9 +219,9 @@ static int uint32_compare(const struct osl_object *obj1, const struct osl_object */ static inline int __fchdir(int fd) { - if (fchdir(fd) < 0) - return -ERRNO_TO_ERROR(errno); - return 1; + if (fchdir(fd) >= 0) + return 1; + return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR; } /** @@ -233,7 +235,7 @@ _static_inline_ int __chdir(const char *path) { if (chdir(path) >= 0) return 1; - return -ERRNO_TO_ERROR(errno); + return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR; } /** @@ -276,10 +278,11 @@ static int fsck_opendir(const char *dirname, DIR **dir, int *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); + ret = errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_OPENDIR; + /* Ignore return value of fchdir() and close(). We're busted anyway. */ + if (cwd) { + int __a_unused ret2 = fchdir(*cwd); /* STFU, gcc */ + } close_cwd: if (cwd) close(*cwd); @@ -310,7 +313,7 @@ static int for_each_file_in_dir(const char *dirname, int cwd_fd, ret2, ret = fsck_opendir(dirname, &dir, &cwd_fd); if (ret < 0) - return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret; + return ret == -E_FSCK_ACCESS? 1 : ret; /* scan cwd recursively */ while ((entry = readdir(dir))) { mode_t m; @@ -385,6 +388,13 @@ static int check_range(struct osl_table *t, uint32_t row_num, uint32_t col_num) return 1; } +static int fsck_mark_row_invalid(struct osl_table *t, int i) +{ + if (conf.dry_run_given) + return 0; + return mark_row_invalid(t, i); +} + /* * check all cells of the given table for boundary violations */ @@ -396,25 +406,18 @@ static int check_index_ranges(struct osl_table *t) //DEBUG_LOG("%d rows. %d columns\n", t->num_rows, t->desc->num_columns); t->num_invalid_rows = 0; for (i = 0; i < t->num_rows; i++) { + const struct osl_column_description *cd; + if (row_is_invalid(t, i)) { t->num_invalid_rows++; continue; } - for (j = 0; j < t->desc->num_columns; j++) { /* FXIME */ - const struct osl_column_description *cd = - get_column_description(t->desc, j); - if (cd->storage_type != OSL_MAPPED_STORAGE) - continue; + FOR_EACH_MAPPED_COLUMN(j, t, cd) { 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); + ret = fsck_mark_row_invalid(t, i); if (ret < 0) goto err; t->num_invalid_rows++; @@ -469,8 +472,11 @@ static int prune_invalid_rows_from_index(struct osl_table *t) INFO_LOG("all rows are valid, good\n"); return 1; } - NOTICE_LOG("deleting %u invalid row(s) (%d bytes) from index\n", + NOTICE_LOG("index contains %u invalid row(s) (%d bytes)\n", t->num_invalid_rows, t->row_index_size * t->num_invalid_rows); + if (conf.dry_run_given) + return 0; + NOTICE_LOG("removing invalid rows from index\n"); bottom = t->num_rows - 1; while (top < bottom) { if (!row_is_invalid(t, top)) { @@ -514,17 +520,14 @@ static int check_for_invalid_objects(struct osl_table *t, uint32_t **lost_bytes) /* first count used bytes */ FOR_EACH_MAPPED_COLUMN(i, t, cd) { loss[i] = t->columns[i].data_map.size; + DEBUG_LOG("column %i data map: %zu bytes\n", i, + t->columns[i].data_map.size); 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; @@ -560,10 +563,10 @@ static int prune_mapped_column(struct osl_table *t, uint32_t col_num, int fd) ret = get_mapped_object(t, col_num, i, &obj); if (ret < 0) return ret; - ret = _write_all(fd, (char *)(obj.data) - 1, obj.size + 1); + ret = _write_all(fd, (char *)(obj.data), obj.size); if (ret < 0) return ret; - written += obj.size + 1; + written += obj.size; ret = get_row_index(t, i, &index_entry); if (ret < 0) return ret; @@ -584,7 +587,8 @@ static int prune_objects(struct osl_table *t, uint32_t *lost_bytes) NOTICE_LOG("removing unreferenced objects from data files\n"); /* first make a copy of the index */ - ret = osl_open(old_idx_filename, O_WRONLY | O_CREAT | O_EXCL, 0644); + DEBUG_LOG("opening %s\n", old_idx_filename); + ret = osl_open(old_idx_filename, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (ret < 0) goto out_free; fd = ret; @@ -678,11 +682,14 @@ static int check_disk_storage_column(struct osl_table *t, int row_num, struct osl_row *row; (*num_missing_objects)++; ERROR_LOG("row %d: object %s is missing\n", row_num, path); + ret = 0; + if (conf.dry_run_given) + goto out; NOTICE_LOG("trying to delete row %d\n", row_num); ret = osl_get_row(t, dsnc, &obj, &row); if (ret < 0) { CRIT_LOG("unable to get row %d\n", row_num); - mark_row_invalid(t, row_num); + fsck_mark_row_invalid(t, row_num); CRIT_LOG("Please re-run fsck\n"); goto out; } @@ -751,10 +758,10 @@ static int dummy_compare(const struct osl_object *obj1, const struct osl_object static unsigned files_pruned; -int prune_disk_storage_file(const char *path, void *private_data) +static 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; @@ -797,6 +804,8 @@ int prune_disk_storage_file(const char *path, void *private_data) invalid: ERROR_LOG("could not read hash value of %s\n", path); remove: + if (conf.dry_run_given) + return 0; NOTICE_LOG("removing %s\n", path); unlink(path); files_pruned++; @@ -811,8 +820,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) @@ -890,8 +900,11 @@ static int fsck_init(struct osl_table_description *desc, struct osl_table **t) ret = map_table(*t, (MAP_TBL_FL_IGNORE_DIRTY)); else ret = map_table(*t, 0); - if (ret >= 0) + if (ret >= 0) { (*t)->num_rows = table_num_rows(*t); + DEBUG_LOG("index header size: %d\n", (*t)->index_header_size); + DEBUG_LOG("row index size: %d\n", (*t)->row_index_size); + } out: return ret; } @@ -917,7 +930,7 @@ static void fsck_cleanup(struct osl_table *t) #define ST_CASE(st) case st: return #st -const char *get_asc_storage_type(enum osl_storage_type st) +static const char *get_asc_storage_type(enum osl_storage_type st) { switch (st) { ST_CASE(OSL_MAPPED_STORAGE); @@ -932,7 +945,7 @@ const char *get_asc_storage_type(enum osl_storage_type st) else str = fsck_strdup(#flag); }} while (0) -char *get_asc_storage_flags(enum osl_storage_type sf) +static char *get_asc_storage_flags(enum osl_storage_type sf) { char *asc_sf = NULL; @@ -1068,12 +1081,12 @@ static int dump_rows(char *dump_dir, struct osl_table *t) current_dir = make_message("%s/rows_%u-%u", dump_dir, i, i + 999); NOTICE_LOG("dumping rows %u - %u\n", i, i + 999); ret = osl_mkdir(current_dir, 0777); - if (ret < 0 && !is_errno(-ret, EEXIST)) + if (ret < 0 && ret != -E_OSL_DIR_EXISTS) goto out; } row_dir = make_message("%s/row_%03u", current_dir, i); ret = osl_mkdir(row_dir, 0777); - if (ret < 0 && !is_errno(-ret, EEXIST)) { + if (ret < 0 && ret != -E_OSL_DIR_EXISTS) { free(row_dir); goto out; } @@ -1097,11 +1110,11 @@ static int dump_table(char *dump_dir, struct osl_table_description *desc) if (ret < 0) goto out; ret = osl_mkdir(dump_dir, 0777); - if (ret < 0 && !is_errno(-ret, EEXIST)) + if (ret < 0 && ret != -E_OSL_DIR_EXISTS) goto out; table_dump_dir = make_message("%s/%s", dump_dir, desc->name); ret = osl_mkdir(table_dump_dir, 0777); - if (ret < 0 && !is_errno(-ret, EEXIST)) + if (ret < 0 && ret != -E_OSL_DIR_EXISTS) goto out; desc_file = make_message("%s/table_description.c", table_dump_dir); ret = osl_open(desc_file, O_WRONLY | O_CREAT | O_EXCL, 0644); @@ -1141,7 +1154,7 @@ static int fsck(struct osl_table_description *desc) ret = check_for_invalid_objects(t, &lost_bytes); if (ret < 0) goto out_unmap; - if (ret > 0) { /* at least one mapped data file needs pruning */ + if (ret > 0 && !conf.dry_run_given) { /* at least one mapped data file needs pruning */ ret = prune_objects(t, lost_bytes); if (ret < 0) goto out_unmap; @@ -1175,7 +1188,8 @@ static int check_table(char *db_dir, char *table_name) ret = dump_table(conf.dump_dir_arg, &desc); out: if (ret < 0) - ERROR_LOG("failed to check table %s\n", table_name); + ERROR_LOG("failed to check table %s: %s\n", table_name, + fsck_strerror(-ret)); else NOTICE_LOG("successfully checked table %s\n", table_name); return ret;