From 7ed4e74502ea3a28335c492964e6e08630e05edc Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Thu, 7 Apr 2011 00:06:56 +0200 Subject: [PATCH] --- yaml --- r: 345998 b: refs/heads/master c: d4da15374ba52009801d4c37c6dae0ba6ec0fca5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 4 ---- trunk/drivers/block/drbd/drbd_receiver.c | 6 ++++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 26bfcbd8e9d8..320a66d4677f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 045417f75c718a4ac97fd44106b8aafcbca5a6da +refs/heads/master: d4da15374ba52009801d4c37c6dae0ba6ec0fca5 diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index bad5d92f83c2..ab938290e358 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -1463,10 +1463,6 @@ extern void __drbd_free_peer_req(struct drbd_conf *, struct drbd_peer_request *, int); #define drbd_free_peer_req(m,e) __drbd_free_peer_req(m, e, 0) #define drbd_free_net_peer_req(m,e) __drbd_free_peer_req(m, e, 1) -extern void drbd_wait_ee_list_empty(struct drbd_conf *mdev, - struct list_head *head); -extern void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, - struct list_head *head); extern void drbd_set_recv_tcq(struct drbd_conf *mdev, int tcq_enabled); extern void _drbd_clear_done_ee(struct drbd_conf *mdev, struct list_head *to_be_freed); extern void conn_flush_workqueue(struct drbd_tconn *tconn); diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 10b9276b28f7..3f68404a17e8 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -428,7 +428,8 @@ static int drbd_finish_peer_reqs(struct drbd_conf *mdev) return err; } -void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head) +static void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, + struct list_head *head) { DEFINE_WAIT(wait); @@ -443,7 +444,8 @@ void _drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head) } } -void drbd_wait_ee_list_empty(struct drbd_conf *mdev, struct list_head *head) +static void drbd_wait_ee_list_empty(struct drbd_conf *mdev, + struct list_head *head) { spin_lock_irq(&mdev->tconn->req_lock); _drbd_wait_ee_list_empty(mdev, head);