RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-27 17:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: adapt to time64_t

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2021-01-27 12:46:26 +01:00 committed by Thomas Schoebel-Theuer
parent a339fc1810
commit cc2af4a024
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/sy_old/sy_generic.c
View File

@ -729,7 +729,8 @@ int mars_symlink(const char *oldpath, const char *newpath,
!stamp && !stamp &&
!stat.mtime.tv_nsec && !stat.mtime.tv_nsec &&
times[0].tv_sec == stat.mtime.tv_sec) { times[0].tv_sec == stat.mtime.tv_sec) {
MARS_DBG("workaround timestamp tv_sec=%ld\n", stat.mtime.tv_sec); MARS_DBG("workaround timestamp tv_sec=%lld\n",
(s64)stat.mtime.tv_sec);
times[0].tv_sec = stat.mtime.tv_sec + 1; times[0].tv_sec = stat.mtime.tv_sec + 1;
/* Setting tv_nsec to 1 prevents from unnecessarily reentering /* Setting tv_nsec to 1 prevents from unnecessarily reentering
* this workaround again if accidentally the original tv_nsec * this workaround again if accidentally the original tv_nsec
@ -991,9 +992,9 @@ int compat_ordered_unlink(const char *path,
marker_status = mars_stat(marker_path, &stat, true); marker_status = mars_stat(marker_path, &stat, true);
if (marker_status < 0 || if (marker_status < 0 ||
lamport_time_compare(stamp, &stat.mtime) >= 0) { lamport_time_compare(stamp, &stat.mtime) >= 0) {
MARS_DBG("creating / updating marker '%s' mtime=%lu.%09lu\n", MARS_DBG("creating / updating marker '%s' mtime=%lld.%09ld\n",
marker_path, marker_path,
stamp->tv_sec, stamp->tv_nsec); (s64)stamp->tv_sec, stamp->tv_nsec);
status = mars_symlink(serial_str, marker_path, stamp, false); status = mars_symlink(serial_str, marker_path, stamp, false);
} }
if (marker_status < 0 || if (marker_status < 0 ||
@ -3383,7 +3384,7 @@ void _show_one(struct mars_brick *test, int *brick_count)
MARS_STAT("---------\n"); MARS_STAT("---------\n");
} }
MARS_STAT("BRICK type = %s path = '%s' name = '%s' " MARS_STAT("BRICK type = %s path = '%s' name = '%s' "
"create_stamp = %ld.%09ld " "create_stamp = %lld.%09ld "
"size_hint=%d " "size_hint=%d "
"mrefs_alloc = %d " "mrefs_alloc = %d "
"mrefs_apsect_alloc = %d " "mrefs_apsect_alloc = %d "
@ -3394,7 +3395,7 @@ void _show_one(struct mars_brick *test, int *brick_count)
SAFE_STR(test->type->type_name), SAFE_STR(test->type->type_name),
SAFE_STR(test->brick_path), SAFE_STR(test->brick_path),
SAFE_STR(test->brick_name), SAFE_STR(test->brick_name),
test->create_stamp.tv_sec, test->create_stamp.tv_nsec, (s64)test->create_stamp.tv_sec, test->create_stamp.tv_nsec,
test->mref_object_layout.size_hint, test->mref_object_layout.size_hint,
atomic_read(&test->mref_object_layout.alloc_count), atomic_read(&test->mref_object_layout.alloc_count),
atomic_read(&test->mref_object_layout.aspect_count), atomic_read(&test->mref_object_layout.aspect_count),
@ -3443,13 +3444,13 @@ void _show_dent_list(struct mars_global *global, int *count)
struct list_head *sub; struct list_head *sub;
dent = container_of(tmp, struct mars_dent, dent_link); dent = container_of(tmp, struct mars_dent, dent_link);
MARS_STAT("dent %d%d %d '%s' '%s' stamp=%ld.%09ld\n", MARS_STAT("dent %d%d %d '%s' '%s' stamp=%lld.%09ld\n",
dent->d_no_scan, dent->d_no_scan,
dent->d_running, dent->d_running,
dent->d_class, dent->d_class,
SAFE_STR(dent->d_path), SAFE_STR(dent->d_path),
SAFE_STR(dent->new_link), SAFE_STR(dent->new_link),
dent->new_stat.mtime.tv_sec, dent->new_stat.mtime.tv_nsec); (s64)dent->new_stat.mtime.tv_sec, dent->new_stat.mtime.tv_nsec);
(*count)++; (*count)++;
for (sub = dent->brick_list.next; sub != &dent->brick_list; sub = sub->next) { for (sub = dent->brick_list.next; sub != &dent->brick_list; sub = sub->next) {
struct mars_brick *test; struct mars_brick *test;