Move the resources_mutex declaration in front of the functions that acquire and release this mutex. Move the drbd_wait_misc() declaration past the struct drbd_device definition. This patch prepares for adding lock context annotations. Signed-off-by: Bart Van Assche --- drivers/block/drbd/drbd_int.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 4b9d69adb9d4..1f3f2157df8b 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -195,7 +195,7 @@ struct drbd_device_work { #include "drbd_interval.h" -int drbd_wait_misc(struct drbd_device *, struct drbd_interval *); +extern struct mutex resources_mutex; void lock_all_resources(void); void unlock_all_resources(void); @@ -1094,6 +1094,7 @@ int drbd_bmio_set_n_write(struct drbd_device *device, struct drbd_peer_device *peer_device); int drbd_bmio_clear_n_write(struct drbd_device *device, struct drbd_peer_device *peer_device); +int drbd_wait_misc(struct drbd_device *device, struct drbd_interval *i); /* Meta data layout * @@ -1363,8 +1364,6 @@ extern struct bio_set drbd_md_io_bio_set; /* And a bio_set for cloning */ extern struct bio_set drbd_io_bio_set; -extern struct mutex resources_mutex; - enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigned int minor); void drbd_destroy_device(struct kref *kref);