aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-08-25 09:14:48 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2014-02-17 10:50:41 -0500
commit4c007603d24ae653db28869a040971f8dfa41971 (patch)
tree63f21eba16cd7c6e8d3dad3375c504ae7e44c027
parentb5043c5e2ca0de11a22e02cd8835c9489f833722 (diff)
drbd: struct after_conn_state_chg_work: Use drbd_work instead of drbd_device_work
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
-rw-r--r--drivers/block/drbd/drbd_state.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 2e8e54b13332..1a84345a3868 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -1530,7 +1530,7 @@ static void after_state_ch(struct drbd_device *device, union drbd_state os,
1530} 1530}
1531 1531
1532struct after_conn_state_chg_work { 1532struct after_conn_state_chg_work {
1533 struct drbd_device_work dw; 1533 struct drbd_work w;
1534 enum drbd_conns oc; 1534 enum drbd_conns oc;
1535 union drbd_state ns_min; 1535 union drbd_state ns_min;
1536 union drbd_state ns_max; /* new, max state, over all devices */ 1536 union drbd_state ns_max; /* new, max state, over all devices */
@@ -1541,7 +1541,7 @@ struct after_conn_state_chg_work {
1541static int w_after_conn_state_ch(struct drbd_work *w, int unused) 1541static int w_after_conn_state_ch(struct drbd_work *w, int unused)
1542{ 1542{
1543 struct after_conn_state_chg_work *acscw = 1543 struct after_conn_state_chg_work *acscw =
1544 container_of(w, struct after_conn_state_chg_work, dw.w); 1544 container_of(w, struct after_conn_state_chg_work, w);
1545 struct drbd_connection *connection = acscw->connection; 1545 struct drbd_connection *connection = acscw->connection;
1546 enum drbd_conns oc = acscw->oc; 1546 enum drbd_conns oc = acscw->oc;
1547 union drbd_state ns_max = acscw->ns_max; 1547 union drbd_state ns_max = acscw->ns_max;
@@ -1843,10 +1843,10 @@ _conn_request_state(struct drbd_connection *connection, union drbd_state mask, u
1843 acscw->ns_min = ns_min; 1843 acscw->ns_min = ns_min;
1844 acscw->ns_max = ns_max; 1844 acscw->ns_max = ns_max;
1845 acscw->flags = flags; 1845 acscw->flags = flags;
1846 acscw->dw.w.cb = w_after_conn_state_ch; 1846 acscw->w.cb = w_after_conn_state_ch;
1847 kref_get(&connection->kref); 1847 kref_get(&connection->kref);
1848 acscw->connection = connection; 1848 acscw->connection = connection;
1849 drbd_queue_work(&connection->sender_work, &acscw->dw.w); 1849 drbd_queue_work(&connection->sender_work, &acscw->w);
1850 } else { 1850 } else {
1851 drbd_err(connection, "Could not kmalloc an acscw\n"); 1851 drbd_err(connection, "Could not kmalloc an acscw\n");
1852 } 1852 }