rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Skip unsynced block counting for synchronized content

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-09-09 23:49:21 +02:00
parent 902c19b668
commit badff9d548
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cmdline/state.c
View file

@ -2360,6 +2360,7 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
int has_hash;
int has_prevhash;
int has_info;
int has_invalid_parity;
char buffer[PATH_MAX];
int ret;
tommy_array disk_mapping;
@ -2382,6 +2383,7 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
has_hash = 0;
has_prevhash = 0;
has_info = 0;
has_invalid_parity = 0;
mapping_max = 0;
tommy_array_init(&disk_mapping);
tommy_hashdyn_init(&bucket_hash);
@ -2634,6 +2636,10 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
/* LCOV_EXCL_STOP */
}
/* all file block states except BLK require a parity update */
if (v_state != BLOCK_STATE_BLK)
has_invalid_parity = 1;
v_file_pos = v_idx;
ret = state_read_block_run(f, file, v_file_pos, v_count, v_state, hash_mode);
if (ret < 0) {
@ -2770,9 +2776,6 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
/* insert the info in the array */
info_set(&state->infoarr, v_pos, info);
if (fs_is_block_unsynced(state, v_pos))
++count_unsynced;
/* go to next block */
++v_pos;
--v_count;
@ -2788,15 +2791,22 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
/* LCOV_EXCL_STOP */
}
if (fs_is_block_unsynced(state, v_pos))
++count_unsynced;
/* go to next block */
++v_pos;
--v_count;
}
}
}
/*
* A synchronized content has no invalid block state, so its unsynced
* count is certainly zero. Scan the extent maps only when needed.
*/
if (has_invalid_parity) {
for (v_pos = 0; v_pos < blockmax; ++v_pos)
if (fs_is_block_unsynced(state, v_pos))
++count_unsynced;
}
} else if (c == 'h') {
/* hole */
block_off_t v_pos;
@ -2848,6 +2858,7 @@ static void state_read_content(struct snapraid_state* state, const char* path, S
switch (c) {
case 'o' :
/* if it's a run of deleted blocks */
has_invalid_parity = 1;
/* ensure the converted byte size fits in signed data_off_t without overflow */
if (v_count > INT64_MAX / (uint64_t)state->block_size) {