diff options
| author | Philipp Reisner | 2011-02-11 20:11:10 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-10-14 16:45:01 +0200 |
| commit | 8410da8f0e3ff5c97bce1b10627316be509ce476 (patch) | |
| tree | 877eb301ff032bc8b95bcf6556d01470a459f98f /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Removed drbd_state_lock() and drbd_state_unlock() (diff) | |
| download | kernel-qcow2-linux-8410da8f0e3ff5c97bce1b10627316be509ce476.tar.gz kernel-qcow2-linux-8410da8f0e3ff5c97bce1b10627316be509ce476.tar.xz kernel-qcow2-linux-8410da8f0e3ff5c97bce1b10627316be509ce476.zip | |
drbd: Introduced tconn->cstate_mutex
In compatibility mode with old DRBDs, use that as the state_mutex
as well.
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index b64b7388ee9d..1781d0ad35e1 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1801,7 +1801,8 @@ void drbd_init_set_defaults(struct drbd_conf *mdev) atomic_set(&mdev->ap_in_flight, 0); mutex_init(&mdev->md_io_mutex); - mutex_init(&mdev->state_mutex); + mutex_init(&mdev->own_state_mutex); + mdev->state_mutex = &mdev->own_state_mutex; spin_lock_init(&mdev->al_lock); spin_lock_init(&mdev->peer_seq_lock); @@ -2189,6 +2190,7 @@ struct drbd_tconn *drbd_new_tconn(char *name) goto fail; tconn->cstate = C_STANDALONE; + mutex_init(&tconn->cstate_mutex); spin_lock_init(&tconn->req_lock); atomic_set(&tconn->net_cnt, 0); init_waitqueue_head(&tconn->net_cnt_wait); |