From: adilger <adilger>
Date: Fri, 4 Jul 2003 18:29:34 +0000 (+0000)
Subject: Quiet a number of ia64 compile errors (not all of which are ia64 specific).
X-Git-Tag: v1_7_0_51~2^9~411
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1e6f62d604e6ed324e1acc12341bde794a642a4e;p=fs%2Flustre-release.git

Quiet a number of ia64 compile errors (not all of which are ia64 specific).
Strangely, it seems that  (int) / (size_t) is promoted to some non-int type
on ia64, I don't know why, since the result could never become larger than int.
---

diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 1048629..d200d4b 100644
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -140,7 +140,7 @@ static int log_commit_thread(void *arg)
         CDEBUG(D_HA, "%s started\n", current->comm);
         do {
                 struct ptlrpc_request *request;
-                struct obd_import *import;
+                struct obd_import *import = NULL;
                 struct list_head *sending_list;
                 int rc = 0;
 
@@ -260,8 +260,9 @@ static int log_commit_thread(void *arg)
                         } else {
                                 spin_unlock(&lcm->lcm_llcd_lock);
                                 CERROR("commit %p dropped %d cookies: rc %d\n",
-                                       llcd, llcd->llcd_cookiebytes /
-                                       sizeof(*llcd->llcd_cookies), rc);
+                                       llcd, (int)(llcd->llcd_cookiebytes /
+                                                   sizeof(*llcd->llcd_cookies)),
+                                       rc);
                                 llcd_put(llcd);
                         }
                         break;