aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-02-21 08:29:27 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-10-14 10:47:58 -0400
commit2f5cdd0b2cf7a4099faa7e53ba0a29ddf0ddf950 (patch)
tree0a90c3b06c455a51536743467e3146bad3507af3 /drivers/block/drbd/drbd_receiver.c
parent49559d87fdfe3ab33c684506c394681da6a746c9 (diff)
drbd: Converted the transfer log from mdev to tconn
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 66080e204086..fcdc2c1cc503 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -3466,7 +3466,7 @@ static int receive_state(struct drbd_conf *mdev, enum drbd_packet cmd,
3466 for temporal network outages! */ 3466 for temporal network outages! */
3467 spin_unlock_irq(&mdev->tconn->req_lock); 3467 spin_unlock_irq(&mdev->tconn->req_lock);
3468 dev_err(DEV, "Aborting Connect, can not thaw IO with an only Consistent peer\n"); 3468 dev_err(DEV, "Aborting Connect, can not thaw IO with an only Consistent peer\n");
3469 tl_clear(mdev); 3469 tl_clear(mdev->tconn);
3470 drbd_uuid_new_current(mdev); 3470 drbd_uuid_new_current(mdev);
3471 clear_bit(NEW_CUR_UUID, &mdev->flags); 3471 clear_bit(NEW_CUR_UUID, &mdev->flags);
3472 drbd_force_state(mdev, NS2(conn, C_PROTOCOL_ERROR, susp, 0)); 3472 drbd_force_state(mdev, NS2(conn, C_PROTOCOL_ERROR, susp, 0));
@@ -4025,7 +4025,7 @@ static int drbd_disconnected(int vnr, void *p, void *data)
4025 mdev->p_uuid = NULL; 4025 mdev->p_uuid = NULL;
4026 4026
4027 if (!is_susp(mdev->state)) 4027 if (!is_susp(mdev->state))
4028 tl_clear(mdev); 4028 tl_clear(mdev->tconn);
4029 4029
4030 drbd_md_sync(mdev); 4030 drbd_md_sync(mdev);
4031 4031
@@ -4585,7 +4585,7 @@ static int got_BarrierAck(struct drbd_conf *mdev, enum drbd_packet cmd)
4585{ 4585{
4586 struct p_barrier_ack *p = &mdev->tconn->meta.rbuf.barrier_ack; 4586 struct p_barrier_ack *p = &mdev->tconn->meta.rbuf.barrier_ack;
4587 4587
4588 tl_release(mdev, p->barrier, be32_to_cpu(p->set_size)); 4588 tl_release(mdev->tconn, p->barrier, be32_to_cpu(p->set_size));
4589 4589
4590 if (mdev->state.conn == C_AHEAD && 4590 if (mdev->state.conn == C_AHEAD &&
4591 atomic_read(&mdev->ap_in_flight) == 0 && 4591 atomic_read(&mdev->ap_in_flight) == 0 &&