diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-03 13:14:15 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:55:41 +0100 |
| 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 523ec094067..332781cfb55 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) if (oc == C_DISCONNECTING && ns_max.conn == C_STANDALONE) { struct net_conf *old_conf; - mutex_lock(&tconn->net_conf_update); + mutex_lock(&tconn->conf_update); old_conf = tconn->net_conf; rcu_assign_pointer(tconn->net_conf, NULL); conn_free_crypto(tconn); - mutex_unlock(&tconn->net_conf_update); + mutex_unlock(&tconn->conf_update); synchronize_rcu(); kfree(old_conf); |