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_state.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_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 91433168e1d4..2cd4fcef554a 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -163,7 +163,7 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask, init_completion(&done); if (f & CS_SERIALIZE) - mutex_lock(&mdev->state_mutex); + mutex_lock(mdev->state_mutex); spin_lock_irqsave(&mdev->tconn->req_lock, flags); os = mdev->state; @@ -215,7 +215,7 @@ drbd_req_state(struct drbd_conf *mdev, union drbd_state mask, abort: if (f & CS_SERIALIZE) - mutex_unlock(&mdev->state_mutex); + mutex_unlock(mdev->state_mutex); return rv; } |