- another merge of b_devel into b_ad

diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 7d05c60..9c65fc3 100644 (file)
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -270,8 +270,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;