Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c03e520 authored by Philipp Reisner's avatar Philipp Reisner Committed by Jens Axboe
Browse files

drbd: Rename asender to ack_receiver 



This prepares the next patch where the sending on the meta (or
control) socket is moved to a dedicated workqueue.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6434f404

drivers/block/drbd/drbd_int.h

+3 −3
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ struct drbd_connection { 
	unsigned long last_reconnect_jif;

	struct drbd_thread receiver;

	struct drbd_thread worker;

	struct drbd_thread asender;

	struct drbd_thread ack_receiver;



	/* cached pointers,

	 * so we can look up the oldest pending requests more quickly.
@@ -1557,7 +1557,7 @@ extern void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req); 


/* drbd_receiver.c */

extern int drbd_receiver(struct drbd_thread *thi);

extern int drbd_asender(struct drbd_thread *thi);

extern int drbd_ack_receiver(struct drbd_thread *thi);

extern bool drbd_rs_c_min_rate_throttle(struct drbd_device *device);

extern bool drbd_rs_should_slow_down(struct drbd_device *device, sector_t sector,

		bool throttle_if_app_is_waiting);
@@ -1971,7 +1971,7 @@ 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))

		force_sig(DRBD_SIG, connection->asender.task);

		force_sig(DRBD_SIG, connection->ack_receiver.task);

}



static inline void request_ping(struct drbd_connection *connection)

drivers/block/drbd/drbd_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1436,8 +1436,8 @@ static int we_should_drop_the_connection(struct drbd_connection *connection, str 
	/* long elapsed = (long)(jiffies - device->last_received); */



	drop_it =   connection->meta.socket == sock

		|| !connection->asender.task

		|| get_t_state(&connection->asender) != RUNNING

		|| !connection->ack_receiver.task

		|| get_t_state(&connection->ack_receiver) != RUNNING

		|| connection->cstate < C_WF_REPORT_PARAMS;



	if (drop_it)
@@ -2564,7 +2564,7 @@ int set_resource_options(struct drbd_resource *resource, struct res_opts *res_op 
		cpumask_copy(resource->cpu_mask, new_cpu_mask);

		for_each_connection_rcu(connection, resource) {

			connection->receiver.reset_cpu_mask = 1;

			connection->asender.reset_cpu_mask = 1;

			connection->ack_receiver.reset_cpu_mask = 1;

			connection->worker.reset_cpu_mask = 1;

		}

	}
@@ -2653,8 +2653,8 @@ struct drbd_connection *conn_create(const char *name, struct res_opts *res_opts) 
	connection->receiver.connection = connection;

	drbd_thread_init(resource, &connection->worker, drbd_worker, "worker");

	connection->worker.connection = connection;

	drbd_thread_init(resource, &connection->asender, drbd_asender, "asender");

	connection->asender.connection = connection;

	drbd_thread_init(resource, &connection->ack_receiver, drbd_ack_receiver, "ack_recv");

	connection->ack_receiver.connection = connection;



	kref_init(&connection->kref);

drivers/block/drbd/drbd_receiver.c

+3 −3
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static int conn_connect(struct drbd_connection *connection) 
		return 0;

	}



	drbd_thread_start(&connection->asender);

	drbd_thread_start(&connection->ack_receiver);



	mutex_lock(&connection->resource->conf_update);

	/* The discard_my_data flag is a single-shot modifier to the next
@@ -4656,7 +4656,7 @@ static void conn_disconnect(struct drbd_connection *connection) 
	conn_request_state(connection, NS(conn, C_NETWORK_FAILURE), CS_HARD);



	/* asender does not clean up anything. it must not interfere, either */

	drbd_thread_stop(&connection->asender);

	drbd_thread_stop(&connection->ack_receiver);

	drbd_free_sock(connection);



	rcu_read_lock();
@@ -5487,7 +5487,7 @@ static struct asender_cmd asender_tbl[] = { 
	[P_RETRY_WRITE]	    = { sizeof(struct p_block_ack), got_BlockAck },

};



int drbd_asender(struct drbd_thread *thi)

int drbd_ack_receiver(struct drbd_thread *thi)

{

	struct drbd_connection *connection = thi->connection;

	struct asender_cmd *cmd = NULL;