Silence some compiler warnings.

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index b00de37..d738e55 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -156,13 +156,12 @@ do {                                                                         \
 #define OBD_FAIL_TIMEOUT(id, secs)                                           \
 do {                                                                         \
         if  (OBD_FAIL_CHECK_ONCE(id)) {                                      \
-                CERROR("obd_fail_timeout id %x sleeping for %ld secs\n",     \
+                CERROR("obd_fail_timeout id %x sleeping for %d secs\n",     \
                        (id), (secs));                                        \
                 set_current_state(TASK_UNINTERRUPTIBLE);                     \
                 schedule_timeout((secs) * HZ);                               \
                 set_current_state(TASK_RUNNING);                             \
-                CERROR("obd_fail_timeout id %x awake\n",                     \
-                       (id));                                                \
+                CERROR("obd_fail_timeout id %x awake\n", (id));              \
        }                                                                     \
 } while(0)
 
@@ -183,6 +182,8 @@ do {                                                                         \
 #define ll_lock_kernel
 #endif
 
+void dev_set_rdonly(kdev_t dev, int no_write);
+void dev_clear_rdonly(int);
 
 static inline void OBD_FAIL_WRITE(int id, kdev_t dev)
 {

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index d148fc3..1b04a74 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -496,7 +496,7 @@ static void reset_recovery_timer(struct obd_device *obd)
 
         if (!recovering)
                 return;
-        CERROR("timer will expire in %ld seconds\n", OBD_RECOVERY_TIMEOUT / HZ);
+        CERROR("timer will expire in %d seconds\n", OBD_RECOVERY_TIMEOUT / HZ);
         mod_timer(&obd->obd_recovery_timer, jiffies + OBD_RECOVERY_TIMEOUT);
 }