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

Automatically convert old content files to the new nanosecond format.

Browse source
This commit is contained in:
Andrea Mazzoleni 2012-07-13 20:53:57 +02:00
parent 71c7f4dffb
commit 04c277f925
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
elem.h
View file

@ -136,6 +136,12 @@ struct snapraid_block {
#define FILE_IS_DAMAGED 8 /**< If a fix was attempted but it failed. */
#define FILE_IS_FIXED 16 /**< If a fix was done. */
/**
* Value used to mark files without the nanoseconds value.
* Note that this value is never reported by stat().
*/
#define FILE_MTIME_NSEC_INVALID -1
/**
* File.
*/
@ -144,7 +150,7 @@ struct snapraid_file {
uint64_t inode; /**< Inode. */
data_off_t size; /**< Size of the file. */
struct snapraid_block* blockvec; /**< All the blocks of the file. */
int mtime_nsec; /**< Modification time nanoseconds. Less than 1000000000. */
int mtime_nsec; /**< Modification time nanoseconds. In the range 0 <= x < 1,000,000,000, or FILE_MTIME_NSEC_INVALID. */
block_off_t blockmax; /**< Number of blocks. */
unsigned flag; /**< FILE_IS_* flags. */
char sub[PATH_MAX]; /**< Sub path of the file. Without the disk dir. The disk is implicit. */

15
scan.c
View file

@ -172,10 +172,23 @@ static void scan_file(struct snapraid_scan* scan, struct snapraid_state* state,
}
/* check if the file is not changed */
if (file->size == st->st_size && file->mtime_sec == st->st_mtime && file->mtime_nsec == st->st_mtim.tv_nsec) {
if (file->size == st->st_size
&& file->mtime_sec == st->st_mtime
/* always accept the value if it's FILE_MTIME_NSEC_INVALID */
/* it happens when upgrading from an old version of SnapRAID */
&& (file->mtime_nsec == st->st_mtim.tv_nsec || file->mtime_nsec == FILE_MTIME_NSEC_INVALID)
) {
/* mark as present */
file_flag_set(file, FILE_IS_PRESENT);
/* update the nano seconds mtime if required */
if (file->mtime_nsec == FILE_MTIME_NSEC_INVALID) {
file->mtime_nsec = st->st_mtim.tv_nsec;
/* we have to save the new mtime */
state->need_write = 1;
}
if (strcmp(file->sub, sub) != 0) {
/* if the path is different, it means a moved file with the same inode */
++scan->count_moved;

6
state.c
View file

@ -887,7 +887,7 @@ void state_read(struct snapraid_state* state)
hash = oathash64(hash, v_mtime_sec);
c = sgetc(f);
if (c == '.') { /* the nanosecond field is present only from version 1.13 */
if (c == '.') { /* the nanosecond field is present only from version 1.12 */
ret = sgetu32(f, &v_mtime_nsec);
if (ret < 0) {
fprintf(stderr, "Invalid 'file' specification in '%s' at line %u\n", path, line);
@ -896,7 +896,11 @@ void state_read(struct snapraid_state* state)
hash = oathash32(hash, v_mtime_nsec);
c = sgetc(f);
} else {
/* use a special value, meaning that we don't have this information */
v_mtime_nsec = FILE_MTIME_NSEC_INVALID;
}
if (c != ' ') {
fprintf(stderr, "Invalid 'file' specification in '%s' at line %u\n", path, line);
exit(EXIT_FAILURE);