From 420c4ba878725a2a9f5c6d041c63150388ff3dc1 Mon Sep 17 00:00:00 2001 From: adilger <adilger> Date: Tue, 2 Sep 2008 22:42:25 +0000 Subject: [PATCH] Branch b1_6 Quiet compiler warnings about mismatched signed/unsigned comparisons. --- lustre/include/obd.h | 6 +++--- lustre/mdc/mdc_locks.c | 2 +- lustre/osc/osc_request.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/include/obd.h b/lustre/include/obd.h index 7233d5853e..4322670dd0 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -376,9 +376,9 @@ struct client_obd { int cl_conn_count; /* max_mds_easize is purely a performance thing so we don't have to * call obd_size_diskmd() all the time. */ - int cl_default_mds_easize; - int cl_max_mds_easize; - int cl_max_mds_cookiesize; + unsigned cl_default_mds_easize; + unsigned cl_max_mds_easize; + unsigned cl_max_mds_cookiesize; //struct llog_canceld_ctxt *cl_llcd; /* it's included by obd_llog_ctxt */ void *cl_llcd_offset; diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index 18ffc11c04..0b54a3f0ca 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -229,7 +229,7 @@ static void mdc_realloc_openmsg(struct ptlrpc_request *req, static struct ptlrpc_request *mdc_intent_open_pack(struct obd_export *exp, struct lookup_intent *it, struct mdc_op_data *data, - void *lmm, int lmmsize) + void *lmm, unsigned lmmsize) { struct ptlrpc_request *req; struct ldlm_intent *lit; diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 1555d61f04..86818af89a 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -3452,8 +3452,8 @@ out: return err; } -static int osc_get_info(struct obd_export *exp, obd_count keylen, - void *key, __u32 *vallen, void *val, struct lov_stripe_md *lsm) +static int osc_get_info(struct obd_export *exp, obd_count keylen, void *key, + __u32 *vallen, void *val, struct lov_stripe_md *lsm) { ENTRY; if (!vallen || !val) @@ -3496,7 +3496,7 @@ static int osc_get_info(struct obd_export *exp, obd_count keylen, struct ptlrpc_request *req; struct ll_user_fiemap *reply; char *bufs[2] = { NULL, key }; - int size[2] = { sizeof(struct ptlrpc_body), keylen }; + __u32 size[2] = { sizeof(struct ptlrpc_body), keylen }; int rc; req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_OST_VERSION, -- GitLab