nfsd: make 'boot_time' 64-bit wide
The local boot time variable gets truncated to time_t at the moment, which can lead to slightly odd behavior on 32-bit architectures. Use ktime_get_real_seconds() instead of get_seconds() to always get a 64-bit result, and keep it that way wherever possible. It still gets truncated in a few places: - When assigning to cl_clientid.cl_boot, this is already documented and is only used as a unique identifier. - In clients_still_reclaiming(), the truncation is to 'unsigned long' in order to use the 'time_before() helper. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:

gecommit door
J. Bruce Fields

bovenliggende
e4598e38ee
commit
9cc7680149
@@ -1445,7 +1445,7 @@ nfsd4_cld_grace_done_v0(struct nfsd_net *nn)
|
||||
}
|
||||
|
||||
cup->cu_u.cu_msg.cm_cmd = Cld_GraceDone;
|
||||
cup->cu_u.cu_msg.cm_u.cm_gracetime = (int64_t)nn->boot_time;
|
||||
cup->cu_u.cu_msg.cm_u.cm_gracetime = nn->boot_time;
|
||||
ret = cld_pipe_upcall(cn->cn_pipe, &cup->cu_u.cu_msg);
|
||||
if (!ret)
|
||||
ret = cup->cu_u.cu_msg.cm_status;
|
||||
@@ -1782,7 +1782,7 @@ nfsd4_cltrack_client_has_session(struct nfs4_client *clp)
|
||||
}
|
||||
|
||||
static char *
|
||||
nfsd4_cltrack_grace_start(time_t grace_start)
|
||||
nfsd4_cltrack_grace_start(time64_t grace_start)
|
||||
{
|
||||
int copied;
|
||||
size_t len;
|
||||
@@ -1795,7 +1795,7 @@ nfsd4_cltrack_grace_start(time_t grace_start)
|
||||
if (!result)
|
||||
return result;
|
||||
|
||||
copied = snprintf(result, len, GRACE_START_ENV_PREFIX "%ld",
|
||||
copied = snprintf(result, len, GRACE_START_ENV_PREFIX "%lld",
|
||||
grace_start);
|
||||
if (copied >= len) {
|
||||
/* just return nothing if output was truncated */
|
||||
@@ -2004,7 +2004,7 @@ nfsd4_umh_cltrack_grace_done(struct nfsd_net *nn)
|
||||
char *legacy;
|
||||
char timestr[22]; /* FIXME: better way to determine max size? */
|
||||
|
||||
sprintf(timestr, "%ld", nn->boot_time);
|
||||
sprintf(timestr, "%lld", nn->boot_time);
|
||||
legacy = nfsd4_cltrack_legacy_topdir();
|
||||
nfsd4_umh_cltrack_upcall("gracedone", timestr, legacy, NULL);
|
||||
kfree(legacy);
|
||||
|
Verwijs in nieuw issue
Block a user