From: Li Dongyang Date: Tue, 11 Jun 2019 05:46:42 +0000 (-0700) Subject: LU-11838 osp: atomic64_read() returns s64 X-Git-Tag: 2.12.3-RC1~153 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=af8ca1fa9e8d63e7e71de050052d6555c5d7ac1e;p=fs%2Flustre-release.git LU-11838 osp: atomic64_read() returns s64 Since kernel 4.17 atomic64_read on x86_64 returns s64 instead of long. 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: dc46952ecd1aa09e738b2de6b1a3076ecbaa740e Lustre-change: https://review.whamcloud.com/34676 Test-Parameters:trivial Signed-off-by: Li Dongyang Change-Id: I805d43251f24417e6405f5d087927c15cf531619 Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/35174 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c index cb475de..461f83c 100644 --- a/lustre/osp/osp_dev.c +++ b/lustre/osp/osp_dev.c @@ -828,8 +828,8 @@ static int osp_sync(const struct lu_env *env, struct dt_device *dev) if (rc != 0) GOTO(out, rc); - CDEBUG(D_CACHE, "%s: processed %lu\n", d->opd_obd->obd_name, - atomic64_read(&d->opd_sync_processed_recs)); + CDEBUG(D_CACHE, "%s: processed %llu\n", d->opd_obd->obd_name, + (unsigned long long)atomic64_read(&d->opd_sync_processed_recs)); while (atomic64_read(&d->opd_sync_processed_recs) < old + recs) { __u64 last = atomic64_read(&d->opd_sync_processed_recs);