From 250866233e4ae873f047277f990ce647cb5de246 Mon Sep 17 00:00:00 2001 From: adilger Date: Thu, 29 Jan 2004 19:51:44 +0000 Subject: [PATCH] Fix compile warnings due to print format mismatches. --- lustre/ldlm/l_lock.c | 2 +- lustre/lov/lov_obd.c | 2 +- lustre/lvfs/fsfilt_reiserfs.c | 2 +- lustre/ptlrpc/llog_server.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ldlm/l_lock.c b/lustre/ldlm/l_lock.c index 262f196..2a4f832 100644 --- a/lustre/ldlm/l_lock.c +++ b/lustre/ldlm/l_lock.c @@ -118,7 +118,7 @@ int l_has_lock(struct lustre_lock *lock) #include void l_check_no_ns_lock(struct ldlm_namespace *ns) { - static long next_msg; + static unsigned long next_msg; if (l_has_lock(&ns->ns_lock) && time_after(jiffies, next_msg)) { CERROR("namespace %s lock held during RPCs; tell phil\n", diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index c32739c..061cd61 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -361,7 +361,7 @@ static int lov_setup(struct obd_device *obd, obd_count len, void *buf) count = desc->ld_tgt_count; uuids = (struct obd_uuid *)lcfg->lcfg_inlbuf2; if (sizeof(*uuids) * count != lcfg->lcfg_inllen2) { - CERROR("UUID array size wrong: %u * %u != %u\n", + CERROR("UUID array size wrong: "LPSZ" * %u != %u\n", sizeof(*uuids), count, lcfg->lcfg_inllen2); RETURN(-EINVAL); } diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c index 36af093..2e16c18 100644 --- a/lustre/lvfs/fsfilt_reiserfs.c +++ b/lustre/lvfs/fsfilt_reiserfs.c @@ -146,7 +146,7 @@ static int fsfilt_reiserfs_add_journal_cb(struct obd_device *obd, __u64 last_rcvd, void *handle, fsfilt_cb_t cb_func, void *cb_data) { - static long next = 0; + static unsigned long next = 0; if (time_after(jiffies, next)) { CERROR("no journal callback kernel patch, faking it...\n"); diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c index 645a32e..b0b739e 100644 --- a/lustre/ptlrpc/llog_server.c +++ b/lustre/ptlrpc/llog_server.c @@ -319,7 +319,7 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len, uncanceled++; } - l = snprintf(out, remains, "[Log Name]: %s\nLog Size: "LPD64"\n" + l = snprintf(out, remains, "[Log Name]: %s\nLog Size: %llu\n" "Last Index: %d\nUncanceled Records: %d\n\n", name[i], handle->lgh_file->f_dentry->d_inode->i_size, @@ -381,7 +381,7 @@ static int llog_catinfo_cb(struct llog_handle *cat, } l = snprintf(out, remains, "\t[Log ID]: #"LPX64"#"LPX64"#%08x\n" - "\tLog Size: "LPD64"\n\tLast Index: %d\n" + "\tLog Size: %llu\n\tLast Index: %d\n" "\tUncanceled Records: %d\n", logid->lgl_oid, logid->lgl_ogr, logid->lgl_ogen, handle->lgh_file->f_dentry->d_inode->i_size, -- 1.8.3.1