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