xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drbd: Rename asender to ack_receiver

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

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Philipp Reisner
2015-03-16 15:01:00 +01:00
committed by Jens Axboe
parent 6434f404b4
commit 1c03e52083
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/block/drbd/drbd_int.h
View File

@@ -754,7 +754,7 @@ struct drbd_connection {
unsigned long last_reconnect_jif; unsigned long last_reconnect_jif;
struct drbd_thread receiver; struct drbd_thread receiver;
struct drbd_thread worker; struct drbd_thread worker;
struct drbd_thread asender; struct drbd_thread ack_receiver;
/* cached pointers, /* cached pointers,
* so we can look up the oldest pending requests more quickly. * 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 */ /* drbd_receiver.c */
extern int drbd_receiver(struct drbd_thread *thi); 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_c_min_rate_throttle(struct drbd_device *device);
extern bool drbd_rs_should_slow_down(struct drbd_device *device, sector_t sector, extern bool drbd_rs_should_slow_down(struct drbd_device *device, sector_t sector,
bool throttle_if_app_is_waiting); 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) static inline void wake_asender(struct drbd_connection *connection)
{ {
if (test_bit(SIGNAL_ASENDER, &connection->flags)) 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) static inline void request_ping(struct drbd_connection *connection)

10
drivers/block/drbd/drbd_main.c
View File

@@ -1436,8 +1436,8 @@ static int we_should_drop_the_connection(struct drbd_connection *connection, str
/* long elapsed = (long)(jiffies - device->last_received); */ /* long elapsed = (long)(jiffies - device->last_received); */
drop_it = connection->meta.socket == sock drop_it = connection->meta.socket == sock
|| !connection->asender.task || !connection->ack_receiver.task
|| get_t_state(&connection->asender) != RUNNING || get_t_state(&connection->ack_receiver) != RUNNING
|| connection->cstate < C_WF_REPORT_PARAMS; || connection->cstate < C_WF_REPORT_PARAMS;
if (drop_it) 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); cpumask_copy(resource->cpu_mask, new_cpu_mask);
for_each_connection_rcu(connection, resource) { for_each_connection_rcu(connection, resource) {
connection->receiver.reset_cpu_mask = 1; 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; 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; connection->receiver.connection = connection;
drbd_thread_init(resource, &connection->worker, drbd_worker, "worker"); drbd_thread_init(resource, &connection->worker, drbd_worker, "worker");
connection->worker.connection = connection; connection->worker.connection = connection;
drbd_thread_init(resource, &connection->asender, drbd_asender, "asender"); drbd_thread_init(resource, &connection->ack_receiver, drbd_ack_receiver, "ack_recv");
connection->asender.connection = connection; connection->ack_receiver.connection = connection;
kref_init(&connection->kref); kref_init(&connection->kref);

6
drivers/block/drbd/drbd_receiver.c
View File

@@ -1099,7 +1099,7 @@ randomize:
return 0; return 0;
} }
drbd_thread_start(&connection->asender); drbd_thread_start(&connection->ack_receiver);
mutex_lock(&connection->resource->conf_update); mutex_lock(&connection->resource->conf_update);
/* The discard_my_data flag is a single-shot modifier to the next /* 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); conn_request_state(connection, NS(conn, C_NETWORK_FAILURE), CS_HARD);
/* asender does not clean up anything. it must not interfere, either */ /* 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); drbd_free_sock(connection);
rcu_read_lock(); rcu_read_lock();
@@ -5487,7 +5487,7 @@ static struct asender_cmd asender_tbl[] = {
[P_RETRY_WRITE] = { sizeof(struct p_block_ack), got_BlockAck }, [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 drbd_connection *connection = thi->connection;
struct asender_cmd *cmd = NULL; struct asender_cmd *cmd = NULL;