diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 7233d5853e6ac8928d4d1210963b57b4d822f40f..4322670dd00f3bff0a27315841a9851cd8551548 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 18ffc11c04e16d7d1e5451cb92b0a83d3647feab..0b54a3f0caa190837c0ba404132185e950f9af98 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 1555d61f0437bb1a3ab8575e915a4d2348817cea..86818af89a9b8db5c11ed13d552eab92c8145e75 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,