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 d5afa0a81fd000cd0cd227c124825bde052e350d..0331ad0b61e18583fb8f5fc5b768134eba0fd6ad 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -490,22 +490,9 @@ 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 = sock_recvmsg(tconn->data.socket, &msg, size, msg.msg_flags);
-       set_fs(oldfs);
+       rv = drbd_recv_short(tconn->data.socket, buf, size, 0);
 
        if (rv < 0) {
                if (rv == -ECONNRESET)
@@ -712,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";
@@ -987,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;
@@ -5390,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: