diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-08-25 17:14:48 +0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 19:50:41 +0400 |
| commit | 4c007603d24ae653db28869a040971f8dfa41971 (patch) | |
| tree | 63f21eba16cd7c6e8d3dad3375c504ae7e44c027 /drivers/block/drbd/drbd_state.c | |
| parent | b5043c5e2ca0de11a22e02cd8835c9489f833722 (diff) | |
| download | linux-4c007603d24ae653db28869a040971f8dfa41971.tar.xz | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 8 |
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, } struct after_conn_state_chg_work { - struct drbd_device_work dw; + struct drbd_work w; enum drbd_conns oc; union drbd_state ns_min; union drbd_state ns_max; /* new, max state, over all devices */ @@ -1541,7 +1541,7 @@ struct after_conn_state_chg_work { static int w_after_conn_state_ch(struct drbd_work *w, int unused) { struct after_conn_state_chg_work *acscw = - container_of(w, struct after_conn_state_chg_work, dw.w); + container_of(w, struct after_conn_state_chg_work, w); struct drbd_connection *connection = acscw->connection; enum drbd_conns oc = acscw->oc; union drbd_state ns_max = acscw->ns_max; @@ -1843,10 +1843,10 @@ _conn_request_state(struct drbd_connection *connection, union drbd_state mask, u acscw->ns_min = ns_min; acscw->ns_max = ns_max; acscw->flags = flags; - acscw->dw.w.cb = w_after_conn_state_ch; + acscw->w.cb = w_after_conn_state_ch; kref_get(&connection->kref); acscw->connection = connection; - drbd_queue_work(&connection->sender_work, &acscw->dw.w); + drbd_queue_work(&connection->sender_work, &acscw->w); } else { drbd_err(connection, "Could not kmalloc an acscw\n"); } |