1 files changed, 19 insertions, 2 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index ab871e00ffc5..93d1f9b469d4 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1668,7 +1668,7 @@ int drbd_send_sync_param(struct drbd_conf *mdev, struct syncer_conf *sc)
 int drbd_send_protocol(struct drbd_conf *mdev)
 {
         struct p_protocol *p;
-        int size, rv;
+        int size, cf, rv;
 
         size = sizeof(struct p_protocol);
 
@@ -1685,9 +1685,22 @@ int drbd_send_protocol(struct drbd_conf *mdev)
         p->after_sb_0p   = cpu_to_be32(mdev->net_conf->after_sb_0p);
         p->after_sb_1p   = cpu_to_be32(mdev->net_conf->after_sb_1p);
         p->after_sb_2p   = cpu_to_be32(mdev->net_conf->after_sb_2p);
-        p->want_lose     = cpu_to_be32(mdev->net_conf->want_lose);
         p->two_primaries = cpu_to_be32(mdev->net_conf->two_primaries);
 
+        cf = 0;
+        if (mdev->net_conf->want_lose)
+                cf |= CF_WANT_LOSE;
+        if (mdev->net_conf->dry_run) {
+                if (mdev->agreed_pro_version >= 92)
+                        cf |= CF_DRY_RUN;
+                else {
+                        dev_err(DEV, "--dry-run is not supported by peer");
+                        kfree(p);
+                        return 0;
+                }
+        }
+        p->conn_flags    = cpu_to_be32(cf);
+
         if (mdev->agreed_pro_version >= 87)
                 strcpy(p->integrity_alg, mdev->net_conf->integrity_alg);
 
@@ -3161,14 +3174,18 @@ void drbd_free_bc(struct drbd_backing_dev *ldev)
 void drbd_free_sock(struct drbd_conf *mdev)
 {
         if (mdev->data.socket) {
+                mutex_lock(&mdev->data.mutex);
                 kernel_sock_shutdown(mdev->data.socket, SHUT_RDWR);
                 sock_release(mdev->data.socket);
                 mdev->data.socket = NULL;
+                mutex_unlock(&mdev->data.mutex);
         }
         if (mdev->meta.socket) {
+                mutex_lock(&mdev->meta.mutex);
                 kernel_sock_shutdown(mdev->meta.socket, SHUT_RDWR);
                 sock_release(mdev->meta.socket);
                 mdev->meta.socket = NULL;
+                mutex_unlock(&mdev->meta.mutex);
         }
 }