From 6a33da12f8e673db828a00f3b11b78005da0cdc6 Mon Sep 17 00:00:00 2001
From: walter <walter>
Date: Sat, 10 May 2008 15:10:59 +0000
Subject: [PATCH] b=15732 i=adilger
fix build warnings which are treated as errors
during Cray XT3 catamount build
---
lustre/ldlm/ldlm_request.c | 4 ++--
lustre/lov/lov_qos.c | 5 +++--
lustre/mdc/mdc_request.c | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 0dcd78159a..630442351a 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -677,10 +677,10 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
} else {
req = *reqp;
LASSERTF(lustre_msg_buflen(req->rq_reqmsg, DLM_LOCKREQ_OFF) >=
- sizeof(*body), "buflen[%d] = %d, not "LPSZ"\n",
+ sizeof(*body), "buflen[%d] = %d, not %d\n",
DLM_LOCKREQ_OFF,
lustre_msg_buflen(req->rq_reqmsg, DLM_LOCKREQ_OFF),
- sizeof(*body));
+ (int)sizeof(*body));
}
lock->l_conn_export = exp;
diff --git a/lustre/lov/lov_qos.c b/lustre/lov/lov_qos.c
index 19d06888ec..cf61023e0a 100644
--- a/lustre/lov/lov_qos.c
+++ b/lustre/lov/lov_qos.c
@@ -622,8 +622,9 @@ repeat_find:
*
* We can only get here if lsm_stripe_count was originally > 1.
*/
- CERROR("can't lstripe objid "LPX64": have "LPSZ" want %u\n",
- lsm->lsm_object_id, idx_pos - idx_arr, lsm->lsm_stripe_count);
+ CERROR("can't lstripe objid "LPX64": have %d want %u\n",
+ lsm->lsm_object_id, (int)(idx_pos - idx_arr),
+ lsm->lsm_stripe_count);
RETURN(-EFBIG);
}
diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index be6589e021..f672ddb30d 100644
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -450,7 +450,7 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
if (rc < sizeof(*md->lsm)) {
CERROR ("lsm size too small: rc < sizeof (*md->lsm) "
- "(%d < "LPSZ")\n", rc, sizeof(*md->lsm));
+ "(%d < %d)\n", rc, (int)sizeof(*md->lsm));
GOTO(err_out, rc = -EPROTO);
}
rc = 0;
--
GitLab