aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-05-03 07:14:15 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 10:55:41 -0500
commita0095508cac5c413c7119076b26f536486314ef1 (patch)
tree8300fc680887021c6c2e16b4236f899161759056 /drivers/block/drbd/drbd_main.c
parent934e6138b56203231d757d7b5ca3252edffc210e (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_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 4ae3e7a99d7c..e37244485d72 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2474,7 +2474,7 @@ struct drbd_tconn *conn_create(const char *name)
2474 tconn->cstate = C_STANDALONE; 2474 tconn->cstate = C_STANDALONE;
2475 mutex_init(&tconn->cstate_mutex); 2475 mutex_init(&tconn->cstate_mutex);
2476 spin_lock_init(&tconn->req_lock); 2476 spin_lock_init(&tconn->req_lock);
2477 mutex_init(&tconn->net_conf_update); 2477 mutex_init(&tconn->conf_update);
2478 init_waitqueue_head(&tconn->ping_wait); 2478 init_waitqueue_head(&tconn->ping_wait);
2479 idr_init(&tconn->volumes); 2479 idr_init(&tconn->volumes);
2480 2480