Cleanup compiler warnings.

b=15981
i=adilger
i=robert.read

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 9faa21a..30146f6 100644 (file)
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -527,7 +527,7 @@ cleanup:
  * a single page on the send/receive side. XXX: 512 should be changed
  * to more adequate value. */
 static inline int ldlm_req_handles_avail(struct obd_export *exp,
-                                         int *size, int bufcount, int off)
+                                         __u32 *size, int bufcount, int off)
 {
         int avail = min_t(int, LDLM_MAXREQSIZE, CFS_PAGE_SIZE - 512);
 
@@ -541,7 +541,7 @@ static inline int ldlm_req_handles_avail(struct obd_export *exp,
 
 static inline int ldlm_cancel_handles_avail(struct obd_export *exp)
 {
-        int size[2] = { sizeof(struct ptlrpc_body),
+        __u32 size[2] = { sizeof(struct ptlrpc_body),
                         sizeof(struct ldlm_request) };
         return ldlm_req_handles_avail(exp, size, 2, 0);
 }
@@ -549,7 +549,7 @@ static inline int ldlm_cancel_handles_avail(struct obd_export *exp)
 /* Cancel lru locks and pack them into the enqueue request. Pack there the given
  * @count locks in @cancels. */
 struct ptlrpc_request *ldlm_prep_elc_req(struct obd_export *exp, int version,
-                                         int opc, int bufcount, int *size,
+                                         int opc, int bufcount, __u32 *size,
                                          int bufoff, int canceloff,
                                          struct list_head *cancels, int count)
 {
@@ -609,7 +609,7 @@ struct ptlrpc_request *ldlm_prep_elc_req(struct obd_export *exp, int version,
 }
 
 struct ptlrpc_request *ldlm_prep_enqueue_req(struct obd_export *exp,
-                                             int bufcount, int *size,
+                                             int bufcount, __u32 *size,
                                              struct list_head *cancels,
                                              int count)
 {
@@ -634,7 +634,7 @@ int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
         struct ldlm_lock *lock;
         struct ldlm_request *body;
         struct ldlm_reply *reply;
-        int size[3] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+        __u32 size[3] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
                         [DLM_LOCKREQ_OFF]     = sizeof(*body),
                         [DLM_REPLY_REC_OFF]   = lvb_len ? lvb_len :
                                                 sizeof(struct ost_lvb) };
@@ -790,7 +790,7 @@ int ldlm_cli_convert(struct lustre_handle *lockh, int new_mode, __u32 *flags)
         struct ldlm_lock *lock;
         struct ldlm_resource *res;
         struct ptlrpc_request *req;
-        int size[2] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+        __u32 size[2] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
                         [DLM_LOCKREQ_OFF]     = sizeof(*body) };
         int rc;
         ENTRY;
@@ -943,7 +943,7 @@ int ldlm_cli_cancel_req(struct obd_export *exp,
 {
         struct ptlrpc_request *req = NULL;
         struct ldlm_request *body;
-        int size[2] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+        __u32 size[2] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
                         [DLM_LOCKREQ_OFF]     = sizeof(*body) };
         struct obd_import *imp;
         int free, sent = 0;
@@ -1934,7 +1934,7 @@ static int replay_one_lock(struct obd_import *imp, struct ldlm_lock *lock)
         struct ldlm_reply *reply;
         struct ldlm_async_args *aa;
         int buffers = 2;
-        int size[3] = { sizeof(struct ptlrpc_body) };
+        __u32 size[3] = { sizeof(struct ptlrpc_body) };
         int flags;
         ENTRY;