aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2011-05-23 18:29:32 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-05-24 04:38:33 -0400
commit0ddf72be4edbd7640b57c13161f71416df16ec11 (patch)
tree5cef009715650da96a82f1b9d9afbd5843b5a105
parent9b2f61aec73dc9e735e247fd720c673b30999e7c (diff)
drbd: fix warning
In file included from drivers/block/drbd/drbd_main.c:54: drivers/block/drbd/drbd_int.h:1190: warning: parameter has incomplete type Forward declarations of enums do not work. Fix it unpleasantly by moving the prototype. Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Lars Ellenberg <drbd-dev@lists.linbit.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/block/drbd/drbd_int.h2
-rw-r--r--drivers/block/drbd/drbd_req.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 7952eb90d17f..b127f8d25b0b 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1219,8 +1219,6 @@ extern void drbd_free_resources(struct drbd_conf *mdev);
1219extern void tl_release(struct drbd_conf *mdev, unsigned int barrier_nr, 1219extern void tl_release(struct drbd_conf *mdev, unsigned int barrier_nr,
1220 unsigned int set_size); 1220 unsigned int set_size);
1221extern void tl_clear(struct drbd_conf *mdev); 1221extern void tl_clear(struct drbd_conf *mdev);
1222enum drbd_req_event;
1223extern void tl_restart(struct drbd_conf *mdev, enum drbd_req_event what);
1224extern void _tl_add_barrier(struct drbd_conf *, struct drbd_tl_epoch *); 1222extern void _tl_add_barrier(struct drbd_conf *, struct drbd_tl_epoch *);
1225extern void drbd_free_sock(struct drbd_conf *mdev); 1223extern void drbd_free_sock(struct drbd_conf *mdev);
1226extern int drbd_send(struct drbd_conf *mdev, struct socket *sock, 1224extern int drbd_send(struct drbd_conf *mdev, struct socket *sock,
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index 281342dca2c8..68a234a5fdc5 100644
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -323,6 +323,7 @@ extern int __req_mod(struct drbd_request *req, enum drbd_req_event what,
323extern void complete_master_bio(struct drbd_conf *mdev, 323extern void complete_master_bio(struct drbd_conf *mdev,
324 struct bio_and_error *m); 324 struct bio_and_error *m);
325extern void request_timer_fn(unsigned long data); 325extern void request_timer_fn(unsigned long data);
326extern void tl_restart(struct drbd_conf *mdev, enum drbd_req_event what);
326 327
327/* use this if you don't want to deal with calling complete_master_bio() 328/* use this if you don't want to deal with calling complete_master_bio()
328 * outside the spinlock, e.g. when walking some list on cleanup. */ 329 * outside the spinlock, e.g. when walking some list on cleanup. */