drbd: Converted drbd_free_sock() and drbd_disconnect() from mdev to tconn
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 3bb412c..a26ec93 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2430,21 +2430,21 @@
kfree(ldev);
}
-void drbd_free_sock(struct drbd_conf *mdev)
+void drbd_free_sock(struct drbd_tconn *tconn)
{
- if (mdev->tconn->data.socket) {
- mutex_lock(&mdev->tconn->data.mutex);
- kernel_sock_shutdown(mdev->tconn->data.socket, SHUT_RDWR);
- sock_release(mdev->tconn->data.socket);
- mdev->tconn->data.socket = NULL;
- mutex_unlock(&mdev->tconn->data.mutex);
+ if (tconn->data.socket) {
+ mutex_lock(&tconn->data.mutex);
+ kernel_sock_shutdown(tconn->data.socket, SHUT_RDWR);
+ sock_release(tconn->data.socket);
+ tconn->data.socket = NULL;
+ mutex_unlock(&tconn->data.mutex);
}
- if (mdev->tconn->meta.socket) {
- mutex_lock(&mdev->tconn->meta.mutex);
- kernel_sock_shutdown(mdev->tconn->meta.socket, SHUT_RDWR);
- sock_release(mdev->tconn->meta.socket);
- mdev->tconn->meta.socket = NULL;
- mutex_unlock(&mdev->tconn->meta.mutex);
+ if (tconn->meta.socket) {
+ mutex_lock(&tconn->meta.mutex);
+ kernel_sock_shutdown(tconn->meta.socket, SHUT_RDWR);
+ sock_release(tconn->meta.socket);
+ tconn->meta.socket = NULL;
+ mutex_unlock(&tconn->meta.mutex);
}
}
@@ -2462,7 +2462,7 @@
crypto_free_hash(mdev->tconn->integrity_r_tfm);
mdev->tconn->integrity_r_tfm = NULL;
- drbd_free_sock(mdev);
+ drbd_free_sock(mdev->tconn);
__no_warn(local,
drbd_free_bc(mdev->ldev);