From c4d11daf607d7cfea1eaa1285dc32c17f0f0289d Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Mon, 13 Jul 2009 15:24:55 +0200
Subject: [PATCH] Implement --dry-run option for fsck.

We had this option for quite some time, but it was silently ignored because
the option was never implemented..
---
 fsck.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/fsck.c b/fsck.c
index 22f6609..84e624d 100644
--- a/fsck.c
+++ b/fsck.c
@@ -388,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
  */
@@ -410,7 +417,7 @@ static int check_index_ranges(struct osl_table *t)
 			if (ret < 0) {
 				if (ret != -E_FSCK_RANGE_VIOLATION)
 					goto err;
-				ret = mark_row_invalid(t, i);
+				ret = fsck_mark_row_invalid(t, i);
 				if (ret < 0)
 					goto err;
 				t->num_invalid_rows++;
@@ -465,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)) {
@@ -672,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;
 		}
@@ -791,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++;
@@ -1139,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;
-- 
2.30.2