1*4882a593SmuzhiyunFrom 383d787d1b77f165da68495cb0363220b66935a4 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Steve Dickson <steved@redhat.com> 3*4882a593SmuzhiyunDate: Tue, 27 Jul 2021 21:12:17 -0400 4*4882a593SmuzhiyunSubject: [PATCH] nfsdcltrack: Use uint64_t instead of time_t 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWith recent commits (4f2a5b64,5a53426c) that fixed 7*4882a593Smuzhiyuncompile errors on x86_64 machines, caused similar 8*4882a593Smuzhiyunerrors on i686 machines. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunThe variable type that was being used was a time_t, 11*4882a593Smuzhiyunwhich changes size between architects, which 12*4882a593Smuzhiyuncaused the compile error. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunChanging the variable to uint64_t fixed the issue. 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Steve Dickson <steved@redhat.com> 17*4882a593SmuzhiyunUpstream: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=383d787d1b77f165da68495cb0363220b66935a4 18*4882a593SmuzhiyunSigned-off-by: Petr Vorel <petr.vorel@gmail.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun utils/nfsdcltrack/nfsdcltrack.c | 2 +- 21*4882a593Smuzhiyun utils/nfsdcltrack/sqlite.c | 2 +- 22*4882a593Smuzhiyun utils/nfsdcltrack/sqlite.h | 2 +- 23*4882a593Smuzhiyun 3 files changed, 3 insertions(+), 3 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c 26*4882a593Smuzhiyunindex 0b37c094..7c1c4bcc 100644 27*4882a593Smuzhiyun--- a/utils/nfsdcltrack/nfsdcltrack.c 28*4882a593Smuzhiyun+++ b/utils/nfsdcltrack/nfsdcltrack.c 29*4882a593Smuzhiyun@@ -508,7 +508,7 @@ cltrack_gracedone(const char *timestr) 30*4882a593Smuzhiyun { 31*4882a593Smuzhiyun int ret; 32*4882a593Smuzhiyun char *tail; 33*4882a593Smuzhiyun- time_t gracetime; 34*4882a593Smuzhiyun+ uint64_t gracetime; 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun ret = sqlite_prepare_dbh(storagedir); 38*4882a593Smuzhiyundiff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c 39*4882a593Smuzhiyunindex cea4a411..cf0c6a45 100644 40*4882a593Smuzhiyun--- a/utils/nfsdcltrack/sqlite.c 41*4882a593Smuzhiyun+++ b/utils/nfsdcltrack/sqlite.c 42*4882a593Smuzhiyun@@ -540,7 +540,7 @@ out_err: 43*4882a593Smuzhiyun * remove any client records that were not reclaimed since grace_start. 44*4882a593Smuzhiyun */ 45*4882a593Smuzhiyun int 46*4882a593Smuzhiyun-sqlite_remove_unreclaimed(time_t grace_start) 47*4882a593Smuzhiyun+sqlite_remove_unreclaimed(uint64_t grace_start) 48*4882a593Smuzhiyun { 49*4882a593Smuzhiyun int ret; 50*4882a593Smuzhiyun char *err = NULL; 51*4882a593Smuzhiyundiff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h 52*4882a593Smuzhiyunindex 06e7c044..ba8cdfa8 100644 53*4882a593Smuzhiyun--- a/utils/nfsdcltrack/sqlite.h 54*4882a593Smuzhiyun+++ b/utils/nfsdcltrack/sqlite.h 55*4882a593Smuzhiyun@@ -26,7 +26,7 @@ int sqlite_insert_client(const unsigned char *clname, const size_t namelen, 56*4882a593Smuzhiyun int sqlite_remove_client(const unsigned char *clname, const size_t namelen); 57*4882a593Smuzhiyun int sqlite_check_client(const unsigned char *clname, const size_t namelen, 58*4882a593Smuzhiyun const bool has_session); 59*4882a593Smuzhiyun-int sqlite_remove_unreclaimed(const time_t grace_start); 60*4882a593Smuzhiyun+int sqlite_remove_unreclaimed(const uint64_t grace_start); 61*4882a593Smuzhiyun int sqlite_query_reclaiming(const time_t grace_start); 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun #endif /* _SQLITE_H */ 64*4882a593Smuzhiyun-- 65*4882a593Smuzhiyun2.32.0 66*4882a593Smuzhiyun 67