47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
diff -Nru nfs-utils-2.4.1.orig/utils/nfsdcld/cld-internal.h nfs-utils-2.4.1/utils/nfsdcld/cld-internal.h
|
||
|
|
--- nfs-utils-2.4.1.orig/utils/nfsdcld/cld-internal.h 2019-06-10 16:34:37.000000000 +0200
|
||
|
|
+++ nfs-utils-2.4.1/utils/nfsdcld/cld-internal.h 2019-07-26 23:56:27.198358900 +0200
|
||
|
|
@@ -24,8 +24,8 @@
|
||
|
|
struct cld_msg cl_msg;
|
||
|
|
};
|
||
|
|
|
||
|
|
-uint64_t current_epoch;
|
||
|
|
-uint64_t recovery_epoch;
|
||
|
|
+long unsigned int current_epoch;
|
||
|
|
+long unsigned int recovery_epoch;
|
||
|
|
int first_time;
|
||
|
|
int num_cltrack_records;
|
||
|
|
int num_legacy_records;
|
||
|
|
diff -Nru nfs-utils-2.4.1.orig/utils/nfsdcld/sqlite.c nfs-utils-2.4.1/utils/nfsdcld/sqlite.c
|
||
|
|
--- nfs-utils-2.4.1.orig/utils/nfsdcld/sqlite.c 2019-06-10 16:34:37.000000000 +0200
|
||
|
|
+++ nfs-utils-2.4.1/utils/nfsdcld/sqlite.c 2019-07-26 23:57:54.812911667 +0200
|
||
|
|
@@ -435,7 +435,7 @@
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
- tcur = (uint64_t)sqlite3_column_int64(stmt, 0);
|
||
|
|
+ tcur = sqlite3_column_int64(stmt, 0);
|
||
|
|
trec = (uint64_t)sqlite3_column_int64(stmt, 1);
|
||
|
|
|
||
|
|
current_epoch = tcur;
|
||
|
|
@@ -854,8 +854,8 @@
|
||
|
|
{
|
||
|
|
int ret, ret2;
|
||
|
|
char *err;
|
||
|
|
- uint64_t tcur = current_epoch;
|
||
|
|
- uint64_t trec = recovery_epoch;
|
||
|
|
+ unsigned long int tcur = current_epoch;
|
||
|
|
+ unsigned long int trec = recovery_epoch;
|
||
|
|
|
||
|
|
/* begin transaction */
|
||
|
|
ret = sqlite3_exec(dbh, "BEGIN EXCLUSIVE TRANSACTION;", NULL, NULL,
|
||
|
|
@@ -875,7 +875,7 @@
|
||
|
|
|
||
|
|
ret = snprintf(buf, sizeof(buf), "UPDATE grace "
|
||
|
|
"SET current = %" PRId64 ", recovery = %" PRId64 ";",
|
||
|
|
- (int64_t)tcur, (int64_t)trec);
|
||
|
|
+ (long int)tcur, (long int)trec);
|
||
|
|
if (ret < 0) {
|
||
|
|
xlog(L_ERROR, "sprintf failed!");
|
||
|
|
goto rollback;
|