diff options
| author | Philipp Reisner | 2011-02-21 14:29:27 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-10-14 16:47:58 +0200 |
| commit | 2f5cdd0b2cf7a4099faa7e53ba0a29ddf0ddf950 (patch) | |
| tree | 0a90c3b06c455a51536743467e3146bad3507af3 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: Improved the dec_*() macros (diff) | |
| download | kernel-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_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 338e1f5c7cd0..ffee90d6d374 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -37,7 +37,6 @@ struct after_state_chg_work { struct completion *done; }; -extern void _tl_restart(struct drbd_conf *mdev, enum drbd_req_event what); static int w_after_state_ch(struct drbd_work *w, int unused); static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, union drbd_state ns, enum chg_state_flags flags); @@ -1009,7 +1008,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, if (ns.susp_fen) { /* case1: The outdate peer handler is successful: */ if (os.pdsk > D_OUTDATED && ns.pdsk <= D_OUTDATED) { - tl_clear(mdev); + tl_clear(mdev->tconn); if (test_bit(NEW_CUR_UUID, &mdev->flags)) { drbd_uuid_new_current(mdev); clear_bit(NEW_CUR_UUID, &mdev->flags); @@ -1028,7 +1027,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, if (what != NOTHING) { spin_lock_irq(&mdev->tconn->req_lock); - _tl_restart(mdev, what); + _tl_restart(mdev->tconn, what); nsm.i &= mdev->state.i; _drbd_set_state(mdev, nsm, CS_VERBOSE, NULL); spin_unlock_irq(&mdev->tconn->req_lock); |