Skip to content
Snippets Groups Projects
Commit 38f5814d authored by Andreas Dilger's avatar Andreas Dilger
Browse files

Silence some compiler warnings.

parent 364960fb
No related branches found
No related tags found
No related merge requests found
...@@ -156,13 +156,12 @@ do { \ ...@@ -156,13 +156,12 @@ do { \
#define OBD_FAIL_TIMEOUT(id, secs) \ #define OBD_FAIL_TIMEOUT(id, secs) \
do { \ do { \
if (OBD_FAIL_CHECK_ONCE(id)) { \ 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)); \ (id), (secs)); \
set_current_state(TASK_UNINTERRUPTIBLE); \ set_current_state(TASK_UNINTERRUPTIBLE); \
schedule_timeout((secs) * HZ); \ schedule_timeout((secs) * HZ); \
set_current_state(TASK_RUNNING); \ set_current_state(TASK_RUNNING); \
CERROR("obd_fail_timeout id %x awake\n", \ CERROR("obd_fail_timeout id %x awake\n", (id)); \
(id)); \
} \ } \
} while(0) } while(0)
...@@ -183,6 +182,8 @@ do { \ ...@@ -183,6 +182,8 @@ do { \
#define ll_lock_kernel #define ll_lock_kernel
#endif #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) static inline void OBD_FAIL_WRITE(int id, kdev_t dev)
{ {
......
...@@ -496,7 +496,7 @@ static void reset_recovery_timer(struct obd_device *obd) ...@@ -496,7 +496,7 @@ static void reset_recovery_timer(struct obd_device *obd)
if (!recovering) if (!recovering)
return; 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); mod_timer(&obd->obd_recovery_timer, jiffies + OBD_RECOVERY_TIMEOUT);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment