diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-03 07:14:15 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:55:41 -0500 |
commit | a0095508cac5c413c7119076b26f536486314ef1 (patch) | |
tree | 8300fc680887021c6c2e16b4236f899161759056 /drivers/block/drbd/drbd_state.c | |
parent | 934e6138b56203231d757d7b5ca3252edffc210e (diff) |
drbd: Renamed the net_conf_update mutex to conf_update
Preparing to use the same mutex for disk_conf updates
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
-rw-r--r-- | drivers/block/drbd/drbd_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 523ec0940673..332781cfb556 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c | |||
@@ -1410,11 +1410,11 @@ static int w_after_conn_state_ch(struct drbd_work *w, int unused) | |||
1410 | if (oc == C_DISCONNECTING && ns_max.conn == C_STANDALONE) { | 1410 | if (oc == C_DISCONNECTING && ns_max.conn == C_STANDALONE) { |
1411 | struct net_conf *old_conf; | 1411 | struct net_conf *old_conf; |
1412 | 1412 | ||
1413 | mutex_lock(&tconn->net_conf_update); | 1413 | mutex_lock(&tconn->conf_update); |
1414 | old_conf = tconn->net_conf; | 1414 | old_conf = tconn->net_conf; |
1415 | rcu_assign_pointer(tconn->net_conf, NULL); | 1415 | rcu_assign_pointer(tconn->net_conf, NULL); |
1416 | conn_free_crypto(tconn); | 1416 | conn_free_crypto(tconn); |
1417 | mutex_unlock(&tconn->net_conf_update); | 1417 | mutex_unlock(&tconn->conf_update); |
1418 | 1418 | ||
1419 | synchronize_rcu(); | 1419 | synchronize_rcu(); |
1420 | kfree(old_conf); | 1420 | kfree(old_conf); |