aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 2636bcc173a6..e9f670cd5542 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -833,7 +833,7 @@ retry:
833 if (signal_pending(current)) { 833 if (signal_pending(current)) {
834 flush_signals(current); 834 flush_signals(current);
835 smp_rmb(); 835 smp_rmb();
836 if (get_t_state(&mdev->receiver) == EXITING) 836 if (get_t_state(&mdev->tconn->receiver) == EXITING)
837 goto out_release_sockets; 837 goto out_release_sockets;
838 } 838 }
839 839
@@ -874,7 +874,7 @@ retry:
874 mdev->tconn->meta.socket = msock; 874 mdev->tconn->meta.socket = msock;
875 mdev->last_received = jiffies; 875 mdev->last_received = jiffies;
876 876
877 D_ASSERT(mdev->asender.task == NULL); 877 D_ASSERT(mdev->tconn->asender.task == NULL);
878 878
879 h = drbd_do_handshake(mdev); 879 h = drbd_do_handshake(mdev);
880 if (h <= 0) 880 if (h <= 0)
@@ -901,7 +901,7 @@ retry:
901 atomic_set(&mdev->packet_seq, 0); 901 atomic_set(&mdev->packet_seq, 0);
902 mdev->peer_seq = 0; 902 mdev->peer_seq = 0;
903 903
904 drbd_thread_start(&mdev->asender); 904 drbd_thread_start(&mdev->tconn->asender);
905 905
906 if (drbd_send_protocol(mdev) == -1) 906 if (drbd_send_protocol(mdev) == -1)
907 return -1; 907 return -1;
@@ -3704,7 +3704,7 @@ static void drbdd(struct drbd_conf *mdev)
3704 size_t shs; /* sub header size */ 3704 size_t shs; /* sub header size */
3705 int rv; 3705 int rv;
3706 3706
3707 while (get_t_state(&mdev->receiver) == RUNNING) { 3707 while (get_t_state(&mdev->tconn->receiver) == RUNNING) {
3708 drbd_thread_current_set_cpu(mdev); 3708 drbd_thread_current_set_cpu(mdev);
3709 if (!drbd_recv_header(mdev, &cmd, &packet_size)) 3709 if (!drbd_recv_header(mdev, &cmd, &packet_size))
3710 goto err_out; 3710 goto err_out;
@@ -3768,7 +3768,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
3768 return; 3768 return;
3769 3769
3770 /* asender does not clean up anything. it must not interfere, either */ 3770 /* asender does not clean up anything. it must not interfere, either */
3771 drbd_thread_stop(&mdev->asender); 3771 drbd_thread_stop(&mdev->tconn->asender);
3772 drbd_free_sock(mdev); 3772 drbd_free_sock(mdev);
3773 3773
3774 /* wait for current activity to cease. */ 3774 /* wait for current activity to cease. */
@@ -3891,7 +3891,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
3891 */ 3891 */
3892static int drbd_send_handshake(struct drbd_conf *mdev) 3892static int drbd_send_handshake(struct drbd_conf *mdev)
3893{ 3893{
3894 /* ASSERT current == mdev->receiver ... */ 3894 /* ASSERT current == mdev->tconn->receiver ... */
3895 struct p_handshake *p = &mdev->tconn->data.sbuf.handshake; 3895 struct p_handshake *p = &mdev->tconn->data.sbuf.handshake;
3896 int ok; 3896 int ok;
3897 3897
@@ -3923,7 +3923,7 @@ static int drbd_send_handshake(struct drbd_conf *mdev)
3923 */ 3923 */
3924static int drbd_do_handshake(struct drbd_conf *mdev) 3924static int drbd_do_handshake(struct drbd_conf *mdev)
3925{ 3925{
3926 /* ASSERT current == mdev->receiver ... */ 3926 /* ASSERT current == mdev->tconn->receiver ... */
3927 struct p_handshake *p = &mdev->tconn->data.rbuf.handshake; 3927 struct p_handshake *p = &mdev->tconn->data.rbuf.handshake;
3928 const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80); 3928 const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80);
3929 unsigned int length; 3929 unsigned int length;