Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6

[firefly-linux-kernel-4.4.55.git] / drivers / block / drbd / drbd_receiver.c

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 0eefbeb65664c49d7b8a85e8124cc874699482c2..0331ad0b61e18583fb8f5fc5b768134eba0fd6ad 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -490,54 +490,34 @@ static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flag
 
 static int drbd_recv(struct drbd_tconn *tconn, void *buf, size_t size)
 {
-       mm_segment_t oldfs;
-       struct kvec iov = {
-               .iov_base = buf,
-               .iov_len = size,
-       };
-       struct msghdr msg = {
-               .msg_iovlen = 1,
-               .msg_iov = (struct iovec *)&iov,
-               .msg_flags = MSG_WAITALL | MSG_NOSIGNAL
-       };
        int rv;
 
-       oldfs = get_fs();
-       set_fs(KERNEL_DS);
+       rv = drbd_recv_short(tconn->data.socket, buf, size, 0);
 
-       for (;;) {
-               rv = sock_recvmsg(tconn->data.socket, &msg, size, msg.msg_flags);
-               if (rv == size)
-                       break;
+       if (rv < 0) {
+               if (rv == -ECONNRESET)
+                       conn_info(tconn, "sock was reset by peer\n");
+               else if (rv != -ERESTARTSYS)
+                       conn_err(tconn, "sock_recvmsg returned %d\n", rv);
+       } else if (rv == 0) {
+               if (test_bit(DISCONNECT_SENT, &tconn->flags)) {
+                       long t;
+                       rcu_read_lock();
+                       t = rcu_dereference(tconn->net_conf)->ping_timeo * HZ/10;
+                       rcu_read_unlock();
 
-               /* Note:
-                * ECONNRESET   other side closed the connection
-                * ERESTARTSYS  (on  sock) we got a signal
-                */
+                       t = wait_event_timeout(tconn->ping_wait, tconn->cstate < C_WF_REPORT_PARAMS, t);
 
-               if (rv < 0) {
-                       if (rv == -ECONNRESET)
-                               conn_info(tconn, "sock was reset by peer\n");
-                       else if (rv != -ERESTARTSYS)
-                               conn_err(tconn, "sock_recvmsg returned %d\n", rv);
-                       break;
-               } else if (rv == 0) {
-                       conn_info(tconn, "sock was shut down by peer\n");
-                       break;
-               } else  {
-                       /* signal came in, or peer/link went down,
-                        * after we read a partial message
-                        */
-                       /* D_ASSERT(signal_pending(current)); */
-                       break;
+                       if (t)
+                               goto out;
                }
-       };
-
-       set_fs(oldfs);
+               conn_info(tconn, "sock was shut down by peer\n");
+       }
 
        if (rv != size)
                conn_request_state(tconn, NS(conn, C_BROKEN_PIPE), CS_HARD);
 
+out:
        return rv;
 }
 
@@ -719,7 +699,7 @@ static int prepare_listen_socket(struct drbd_tconn *tconn, struct accept_wait_da
                goto out;
        }
 
-       s_listen->sk->sk_reuse = 1; /* SO_REUSEADDR */
+       s_listen->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
        drbd_setbufsize(s_listen, sndbuf_size, rcvbuf_size);
 
        what = "bind before listen";
@@ -894,6 +874,7 @@ static int conn_connect(struct drbd_tconn *tconn)
                .door_bell = COMPLETION_INITIALIZER_ONSTACK(ad.door_bell),
        };
 
+       clear_bit(DISCONNECT_SENT, &tconn->flags);
        if (conn_request_state(tconn, NS(conn, C_WF_CONNECTION), CS_VERBOSE) < SS_SUCCESS)
                return -2;
 
@@ -993,8 +974,8 @@ randomize:
        if (ad.s_listen)
                sock_release(ad.s_listen);
 
-       sock.socket->sk->sk_reuse = 1; /* SO_REUSEADDR */
-       msock.socket->sk->sk_reuse = 1; /* SO_REUSEADDR */
+       sock.socket->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
+       msock.socket->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */
 
        sock.socket->sk->sk_allocation = GFP_NOIO;
        msock.socket->sk->sk_allocation = GFP_NOIO;
@@ -4532,6 +4513,10 @@ static int drbd_disconnected(struct drbd_conf *mdev)
           necessary to reclain net_ee in drbd_finish_peer_reqs(). */
        drbd_flush_workqueue(mdev);
 
+       /* need to do it again, drbd_finish_peer_reqs() may have populated it
+        * again via drbd_try_clear_on_disk_bm(). */
+       drbd_rs_cancel_all(mdev);
+
        kfree(mdev->p_uuid);
        mdev->p_uuid = NULL;
 
@@ -5316,6 +5301,18 @@ int drbd_asender(struct drbd_thread *thi)
                        received += rv;
                        buf      += rv;
                } else if (rv == 0) {
+                       if (test_bit(DISCONNECT_SENT, &tconn->flags)) {
+                               long t;
+                               rcu_read_lock();
+                               t = rcu_dereference(tconn->net_conf)->ping_timeo * HZ/10;
+                               rcu_read_unlock();
+
+                               t = wait_event_timeout(tconn->ping_wait,
+                                                      tconn->cstate < C_WF_REPORT_PARAMS,
+                                                      t);
+                               if (t)
+                                       break;
+                       }
                        conn_err(tconn, "meta connection shut down by peer.\n");
                        goto reconnect;
                } else if (rv == -EAGAIN) {
@@ -5380,6 +5377,7 @@ int drbd_asender(struct drbd_thread *thi)
        if (0) {
 reconnect:
                conn_request_state(tconn, NS(conn, C_NETWORK_FAILURE), CS_HARD);
+               conn_md_sync(tconn);
        }
        if (0) {
 disconnect: