diff options
| author | Philipp Reisner | 2011-05-03 13:14:15 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:55:41 +0100 |
| commit | a0095508cac5c413c7119076b26f536486314ef1 (patch) | |
| tree | 8300fc680887021c6c2e16b4236f899161759056 /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Removed dead code (diff) | |
| download | kernel-qcow2-linux-a0095508cac5c413c7119076b26f536486314ef1.tar.gz kernel-qcow2-linux-a0095508cac5c413c7119076b26f536486314ef1.tar.xz kernel-qcow2-linux-a0095508cac5c413c7119076b26f536486314ef1.zip | |
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 956cdda93430..567d64b9906c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3221,7 +3221,7 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) p->csums_alg[SHARED_SECRET_MAX-1] = 0; } - mutex_lock(&mdev->tconn->net_conf_update); + mutex_lock(&mdev->tconn->conf_update); old_conf = mdev->tconn->net_conf; if (strcmp(old_conf->verify_alg, p->verify_alg)) { @@ -3296,7 +3296,7 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) } rcu_assign_pointer(tconn->net_conf, new_conf); } - mutex_unlock(&mdev->tconn->net_conf_update); + mutex_unlock(&mdev->tconn->conf_update); if (new_conf) { synchronize_rcu(); kfree(old_conf); @@ -3314,7 +3314,7 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi) return 0; disconnect: - mutex_unlock(&mdev->tconn->net_conf_update); + mutex_unlock(&mdev->tconn->conf_update); /* just for completeness: actually not needed, * as this is not reached if csums_tfm was ok. */ crypto_free_hash(csums_tfm); @@ -3744,9 +3744,9 @@ static int receive_state(struct drbd_tconn *tconn, struct packet_info *pi) } } - mutex_lock(&mdev->tconn->net_conf_update); + mutex_lock(&mdev->tconn->conf_update); mdev->tconn->net_conf->want_lose = 0; /* without copy; single bit op is atomic */ - mutex_unlock(&mdev->tconn->net_conf_update); + mutex_unlock(&mdev->tconn->conf_update); drbd_md_sync(mdev); /* update connected indicator, la_size, ... */ |