Commit b5043c5e authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Turn conn_flush_workqueue() into drbd_flush_workqueue() 



The new function can flush any work queue, not just the work queue of the data
socket of a connection.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 84b8c06b

drivers/block/drbd/drbd_int.h

+2 −10
Original line number Diff line number Diff line
@@ -351,11 +351,6 @@ enum epoch_event { 
	EV_CLEANUP = 32, /* used as flag */

};



struct drbd_wq_barrier {

	struct drbd_work w;

	struct completion done;

};



struct digest_info {

	int digest_size;

	void *digest;
@@ -1354,12 +1349,7 @@ extern void __drbd_free_peer_req(struct drbd_device *, struct drbd_peer_request 
extern struct page *drbd_alloc_pages(struct drbd_peer_device *, unsigned int, bool);

extern void drbd_set_recv_tcq(struct drbd_device *device, int tcq_enabled);

extern void _drbd_clear_done_ee(struct drbd_device *device, struct list_head *to_be_freed);

extern void conn_flush_workqueue(struct drbd_connection *connection);

extern int drbd_connected(struct drbd_peer_device *);

static inline void drbd_flush_workqueue(struct drbd_device *device)

{

	conn_flush_workqueue(first_peer_device(device)->connection);

}



/* Yes, there is kernel_setsockopt, but only since 2.6.18.

 * So we have our own copy of it here. */
@@ -1714,6 +1704,8 @@ drbd_queue_work(struct drbd_work_queue *q, struct drbd_work *w) 
	wake_up(&q->q_wait);

}



extern void drbd_flush_workqueue(struct drbd_work_queue *work_queue);



static inline void wake_asender(struct drbd_connection *connection)

{

	if (test_bit(SIGNAL_ASENDER, &connection->flags))

drivers/block/drbd/drbd_main.c

+24 −0
Original line number Diff line number Diff line
@@ -2397,6 +2397,30 @@ static void drbd_init_workqueue(struct drbd_work_queue* wq) 
	init_waitqueue_head(&wq->q_wait);

}



struct completion_work {

	struct drbd_work w;

	struct completion done;

};



static int w_complete(struct drbd_work *w, int cancel)

{

	struct completion_work *completion_work =

		container_of(w, struct completion_work, w);



	complete(&completion_work->done);

	return 0;

}



void drbd_flush_workqueue(struct drbd_work_queue *work_queue)

{

	struct completion_work completion_work;



	completion_work.w.cb = w_complete;

	init_completion(&completion_work.done);

	drbd_queue_work(work_queue, &completion_work.w);

	wait_for_completion(&completion_work.done);

}



struct drbd_resource *drbd_find_resource(const char *name)

{

	struct drbd_resource *resource;

drivers/block/drbd/drbd_nl.c

+5 −5
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ void drbd_reconsider_max_bio_size(struct drbd_device *device) 
static void conn_reconfig_start(struct drbd_connection *connection)

{

	drbd_thread_start(&connection->worker);

	conn_flush_workqueue(connection);

	drbd_flush_workqueue(&connection->sender_work);

}



/* if still unconfigured, stops worker again. */
@@ -1600,7 +1600,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) 
	 */

	wait_event(device->misc_wait, !atomic_read(&device->ap_pending_cnt) || drbd_suspended(device));

	/* and for any other previously queued work */

	drbd_flush_workqueue(device);

	drbd_flush_workqueue(&first_peer_device(device)->connection->sender_work);



	rv = _drbd_request_state(device, NS(disk, D_ATTACHING), CS_VERBOSE);

	retcode = rv;  /* FIXME: Type mismatch. */
@@ -2249,7 +2249,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) 


	((char *)new_net_conf->shared_secret)[SHARED_SECRET_MAX-1] = 0;



	conn_flush_workqueue(connection);

	drbd_flush_workqueue(&connection->sender_work);



	mutex_lock(&adm_ctx.resource->conf_update);

	old_net_conf = connection->net_conf;
@@ -2589,7 +2589,7 @@ int drbd_adm_invalidate(struct sk_buff *skb, struct genl_info *info) 
	 * Also wait for it's after_state_ch(). */

	drbd_suspend_io(device);

	wait_event(device->misc_wait, !test_bit(BITMAP_IO, &device->flags));

	drbd_flush_workqueue(device);

	drbd_flush_workqueue(&first_peer_device(device)->connection->sender_work);



	/* If we happen to be C_STANDALONE R_SECONDARY, just change to

	 * D_INCONSISTENT, and set all bits in the bitmap.  Otherwise,
@@ -2655,7 +2655,7 @@ int drbd_adm_invalidate_peer(struct sk_buff *skb, struct genl_info *info) 
	 * Also wait for it's after_state_ch(). */

	drbd_suspend_io(device);

	wait_event(device->misc_wait, !test_bit(BITMAP_IO, &device->flags));

	drbd_flush_workqueue(device);

	drbd_flush_workqueue(&first_peer_device(device)->connection->sender_work);



	/* If we happen to be C_STANDALONE R_PRIMARY, just set all bits

	 * in the bitmap.  Otherwise, try to start a resync handshake

drivers/block/drbd/drbd_receiver.c

+2 −20
Original line number Diff line number Diff line
@@ -4485,24 +4485,6 @@ static void drbdd(struct drbd_connection *connection) 
	conn_request_state(connection, NS(conn, C_PROTOCOL_ERROR), CS_HARD);

}



static int w_complete(struct drbd_work *w, int cancel)

{

	struct drbd_wq_barrier *b = container_of(w, struct drbd_wq_barrier, w);



	complete(&b->done);

	return 0;

}



void conn_flush_workqueue(struct drbd_connection *connection)

{

	struct drbd_wq_barrier barr;



	barr.w.cb = w_complete;

	init_completion(&barr.done);

	drbd_queue_work(&connection->sender_work, &barr.w);

	wait_for_completion(&barr.done);

}



static void conn_disconnect(struct drbd_connection *connection)

{

	struct drbd_peer_device *peer_device;
@@ -4590,14 +4572,14 @@ static int drbd_disconnected(struct drbd_peer_device *peer_device) 
	/* wait for all w_e_end_data_req, w_e_end_rsdata_req, w_send_barrier,

	 * w_make_resync_request etc. which may still be on the worker queue

	 * to be "canceled" */

	drbd_flush_workqueue(device);

	drbd_flush_workqueue(&peer_device->connection->sender_work);



	drbd_finish_peer_reqs(device);



	/* This second workqueue flush is necessary, since drbd_finish_peer_reqs()

	   might have issued a work again. The one before drbd_finish_peer_reqs() is

	   necessary to reclain net_ee in drbd_finish_peer_reqs(). */

	drbd_flush_workqueue(device);

	drbd_flush_workqueue(&peer_device->connection->sender_work);



	/* need to do it again, drbd_finish_peer_reqs() may have populated it

	 * again via drbd_try_clear_on_disk_bm(). */

CRA Git | Maintained and supported by SUSTech CRA and CCSE