From 88e53fd9a37f3045e3f3301430ba918db2a7e45e Mon Sep 17 00:00:00 2001
From: Andrea Mazzoleni <amadvance@gmail.com>
Date: Sat, 1 Nov 2014 16:53:11 +0100
Subject: [PATCH] Removes count block info when reading/writing content file.

---
 HISTORY         |  2 +-
 cmdline/state.c | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/HISTORY b/HISTORY
index 8f4c7ce2..b5ecbdb2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,7 +1,7 @@
 SnapRAID HISTORY
 ================
 
-7.0 2014/10
+7.0 2014/11
 ===========
  * In 'check' and 'fix' the array is scanned to find any moved files
    that could be used to recover missing data. Files are identified by
diff --git a/cmdline/state.c b/cmdline/state.c
index 5c5bdfb4..212756ba 100644
--- a/cmdline/state.c
+++ b/cmdline/state.c
@@ -1218,7 +1218,6 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
 	block_off_t paritymax;
 	unsigned line;
 	unsigned count_file;
-	unsigned count_block;
 	unsigned count_hardlink;
 	unsigned count_symlink;
 	unsigned count_dir;
@@ -1231,7 +1230,6 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
 	blockmax = 0;
 	paritymax = 0;
 	count_file = 0;
-	count_block = 0;
 	count_hardlink = 0;
 	count_symlink = 0;
 	count_dir = 0;
@@ -1395,9 +1393,6 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
 				file = 0;
 				disk = 0;
 			}
-
-			/* stat */
-			++count_block;
 		} else if (strcmp(tag, "inf") == 0) {
 			/* "inf" command */
 			block_off_t v_pos;
@@ -2180,7 +2175,6 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
 
 	if (state->opt.verbose) {
 		printf("%8u files\n", count_file);
-		printf("%8u blocks\n", count_block);
 		printf("%8u hardlinks\n", count_hardlink);
 		printf("%8u symlinks\n", count_symlink);
 		printf("%8u empty dirs\n", count_dir);
@@ -2190,7 +2184,6 @@ static void state_read_text(struct snapraid_state* state, const char* path, STRE
 static void state_write_text(struct snapraid_state* state, STREAM* f)
 {
 	unsigned count_file;
-	unsigned count_block;
 	unsigned count_hardlink;
 	unsigned count_symlink;
 	unsigned count_dir;
@@ -2200,7 +2193,6 @@ static void state_write_text(struct snapraid_state* state, STREAM* f)
 	int info_has_rehash;
 
 	count_file = 0;
-	count_block = 0;
 	count_hardlink = 0;
 	count_symlink = 0;
 	count_dir = 0;
@@ -2414,8 +2406,6 @@ static void state_write_text(struct snapraid_state* state, STREAM* f)
 					exit(EXIT_FAILURE);
 					/* LCOV_EXCL_STOP */
 				}
-
-				++count_block;
 			}
 
 			++count_file;
@@ -2543,7 +2533,6 @@ static void state_write_text(struct snapraid_state* state, STREAM* f)
 
 	if (state->opt.verbose) {
 		printf("%8u files\n", count_file);
-		printf("%8u blocks\n", count_block);
 		printf("%8u hardlinks\n", count_hardlink);
 		printf("%8u symlinks\n", count_symlink);
 		printf("%8u empty dirs\n", count_dir);
@@ -2626,7 +2615,6 @@ static void state_read_binary(struct snapraid_state* state, const char* path, ST
 	block_off_t blockmax;
 	block_off_t paritymax;
 	unsigned count_file;
-	unsigned count_block;
 	unsigned count_hardlink;
 	unsigned count_symlink;
 	unsigned count_dir;
@@ -2639,7 +2627,6 @@ static void state_read_binary(struct snapraid_state* state, const char* path, ST
 	blockmax = 0;
 	paritymax = 0;
 	count_file = 0;
-	count_block = 0;
 	count_hardlink = 0;
 	count_symlink = 0;
 	count_dir = 0;
@@ -2916,9 +2903,6 @@ static void state_read_binary(struct snapraid_state* state, const char* path, ST
 					/* insert the block in the block array */
 					tommy_arrayblk_set(&disk->blockarr, v_pos, block);
 
-					/* stat */
-					++count_block;
-
 					/* go to the next block */
 					++v_idx;
 					++v_pos;
@@ -3489,7 +3473,6 @@ static void state_read_binary(struct snapraid_state* state, const char* path, ST
 
 	if (state->opt.verbose) {
 		printf("%8u files\n", count_file);
-		printf("%8u blocks\n", count_block);
 		printf("%8u hardlinks\n", count_hardlink);
 		printf("%8u symlinks\n", count_symlink);
 		printf("%8u empty dirs\n", count_dir);
@@ -3499,7 +3482,6 @@ static void state_read_binary(struct snapraid_state* state, const char* path, ST
 static void state_write_binary(struct snapraid_state* state, STREAM* f)
 {
 	unsigned count_file;
-	unsigned count_block;
 	unsigned count_hardlink;
 	unsigned count_symlink;
 	unsigned count_dir;
@@ -3512,7 +3494,6 @@ static void state_write_binary(struct snapraid_state* state, STREAM* f)
 	int mapping_idx;
 
 	count_file = 0;
-	count_block = 0;
 	count_hardlink = 0;
 	count_symlink = 0;
 	count_dir = 0;
@@ -3747,8 +3728,6 @@ static void state_write_binary(struct snapraid_state* state, STREAM* f)
 					/* LCOV_EXCL_STOP */
 				}
 
-				count_block += v_count;
-
 				/* next begin position */
 				begin = end;
 			}
@@ -3924,7 +3903,6 @@ static void state_write_binary(struct snapraid_state* state, STREAM* f)
 
 	if (state->opt.verbose) {
 		printf("%8u files\n", count_file);
-		printf("%8u blocks\n", count_block);
 		printf("%8u hardlinks\n", count_hardlink);
 		printf("%8u symlinks\n", count_symlink);
 		printf("%8u empty dirs\n", count_dir);