From: Li Dongyang Date: Tue, 11 Jun 2019 05:52:12 +0000 (-0700) Subject: LU-11838 ldlm: struct timespec64.tv_sec type change X-Git-Tag: 2.12.3-RC1~152 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=65ca8469d04bf4cad89fb77ec0457ba2661a275c;p=fs%2Flustre-release.git LU-11838 ldlm: struct timespec64.tv_sec type change 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. This patch is back-ported from the following one: Lustre-commit: f2bf0379a773c8c1659bfe018a22861784a0b9a6 Lustre-change: https://review.whamcloud.com/34677 Test-Parameters:trivial Signed-off-by: Li Dongyang Change-Id: Ib4c80c9b20854d45b1b3c04057c45ee20d5413d9 Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/35175 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Gu Zheng Reviewed-by: Oleg Drokin --- diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index b79ca1c..8d70457 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -2305,11 +2305,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) {