diff options
| author | Philipp Reisner | 2011-03-15 18:40:27 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-04 00:16:27 +0100 |
| commit | 8169e41b3e59ee74a31270804a1b5ccef9ae9fce (patch) | |
| tree | 3a4d9065937bb7645bf7737660c07a58aa6f1a2e /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Do not modify the connection state with something else that conn_reques... (diff) | |
| download | kernel-qcow2-linux-8169e41b3e59ee74a31270804a1b5ccef9ae9fce.tar.gz kernel-qcow2-linux-8169e41b3e59ee74a31270804a1b5ccef9ae9fce.tar.xz kernel-qcow2-linux-8169e41b3e59ee74a31270804a1b5ccef9ae9fce.zip | |
drbd: Moved CONN_DRY_RUN to the per connection (tconn) flags
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index ac2a25f6b256..4bac2f56ca2c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -2800,7 +2800,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_conf *mdev, enum drbd_rol } } - if (mdev->tconn->net_conf->dry_run || test_bit(CONN_DRY_RUN, &mdev->flags)) { + if (mdev->tconn->net_conf->dry_run || test_bit(CONN_DRY_RUN, &mdev->tconn->flags)) { if (hg == 0) dev_info(DEV, "dry-run connect: No resync, would become Connected immediately.\n"); else @@ -2869,10 +2869,10 @@ static int receive_protocol(struct drbd_conf *mdev, enum drbd_packet cmd, cf = be32_to_cpu(p->conn_flags); p_want_lose = cf & CF_WANT_LOSE; - clear_bit(CONN_DRY_RUN, &mdev->flags); + clear_bit(CONN_DRY_RUN, &mdev->tconn->flags); if (cf & CF_DRY_RUN) - set_bit(CONN_DRY_RUN, &mdev->flags); + set_bit(CONN_DRY_RUN, &mdev->tconn->flags); if (p_proto != mdev->tconn->net_conf->wire_protocol) { dev_err(DEV, "incompatible communication protocols\n"); @@ -3439,7 +3439,7 @@ static int receive_state(struct drbd_conf *mdev, enum drbd_packet cmd, peer_state.disk = D_DISKLESS; real_peer_disk = D_DISKLESS; } else { - if (test_and_clear_bit(CONN_DRY_RUN, &mdev->flags)) + if (test_and_clear_bit(CONN_DRY_RUN, &mdev->tconn->flags)) return false; D_ASSERT(os.conn == C_WF_REPORT_PARAMS); conn_request_state(mdev->tconn, NS(conn, C_DISCONNECTING), CS_HARD); |