summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorPhilipp Reisner2011-02-21 14:29:27 +0100
committerPhilipp Reisner2011-10-14 16:47:58 +0200
commit2f5cdd0b2cf7a4099faa7e53ba0a29ddf0ddf950 (patch)
tree0a90c3b06c455a51536743467e3146bad3507af3 /drivers/block/drbd/drbd_receiver.c
parentdrbd: Improved the dec_*() macros (diff)
downloadkernel-qcow2-linux-2f5cdd0b2cf7a4099faa7e53ba0a29ddf0ddf950.tar.gz
kernel-qcow2-linux-2f5cdd0b2cf7a4099faa7e53ba0a29ddf0ddf950.tar.xz
kernel-qcow2-linux-2f5cdd0b2cf7a4099faa7e53ba0a29ddf0ddf950.zip
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,
for temporal network outages! */
spin_unlock_irq(&mdev->tconn->req_lock);
dev_err(DEV, "Aborting Connect, can not thaw IO with an only Consistent peer\n");
- tl_clear(mdev);
+ tl_clear(mdev->tconn);
drbd_uuid_new_current(mdev);
clear_bit(NEW_CUR_UUID, &mdev->flags);
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)
mdev->p_uuid = NULL;
if (!is_susp(mdev->state))
- tl_clear(mdev);
+ tl_clear(mdev->tconn);
drbd_md_sync(mdev);
@@ -4585,7 +4585,7 @@ static int got_BarrierAck(struct drbd_conf *mdev, enum drbd_packet cmd)
{
struct p_barrier_ack *p = &mdev->tconn->meta.rbuf.barrier_ack;
- tl_release(mdev, p->barrier, be32_to_cpu(p->set_size));
+ tl_release(mdev->tconn, p->barrier, be32_to_cpu(p->set_size));
if (mdev->state.conn == C_AHEAD &&
atomic_read(&mdev->ap_in_flight) == 0 &&