Whamcloud - gitweb
LU-11838 ldlm: struct timespec64.tv_sec type change 77/34677/4
authorLi Dongyang <dongyangli@ddn.com>
Tue, 16 Apr 2019 05:41:04 +0000 (15:41 +1000)
committerOleg Drokin <green@whamcloud.com>
Tue, 21 May 2019 05:13:02 +0000 (05:13 +0000)
Since kernel 4.18 struct timespec64 is no longer defined
as struct timespec on 64bit systems, this means tv_sec
is no longer __kernel_time_t but now time64_t.

Use %llu as the format specifier and explicitly cast it
to unsigned long long.

Test-Parameters:trivial
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Change-Id: Ib4c80c9b20854d45b1b3c04057c45ee20d5413d9
Reviewed-on: https://review.whamcloud.com/34677
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
lustre/ldlm/ldlm_lockd.c

index 47e1cda..d3737cb 100644 (file)
@@ -2431,10 +2431,10 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req)
        if (req->rq_export == NULL) {
                struct ldlm_request *dlm_req;
 
-               CERROR("%s from %s arrived at %lu with bad export cookie %llu\n",
+               CERROR("%s from %s arrived at %llu with bad export cookie %llu\n",
                       ll_opcode2str(lustre_msg_get_opc(req->rq_reqmsg)),
                       libcfs_nid2str(req->rq_peer.nid),
-                      req->rq_arrival_time.tv_sec,
+                      (unsigned long long)req->rq_arrival_time.tv_sec,
                       lustre_msg_get_handle(req->rq_reqmsg)->cookie);
 
                if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_CANCEL) {