drbd: cleanup: This code path to trigger a resync is no longer needed
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
parent
8d4ce82b3c
commit
c3fe30b0e7
1 changed files with 0 additions and 17 deletions
|
@ -2853,7 +2853,6 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h)
|
||||||
unsigned int max_seg_s;
|
unsigned int max_seg_s;
|
||||||
sector_t p_size, p_usize, my_usize;
|
sector_t p_size, p_usize, my_usize;
|
||||||
int ldsc = 0; /* local disk size changed */
|
int ldsc = 0; /* local disk size changed */
|
||||||
enum drbd_conns nconn;
|
|
||||||
|
|
||||||
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
|
ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;
|
||||||
if (drbd_recv(mdev, h->payload, h->length) != h->length)
|
if (drbd_recv(mdev, h->payload, h->length) != h->length)
|
||||||
|
@ -2920,22 +2919,6 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h)
|
||||||
drbd_set_my_capacity(mdev, p_size);
|
drbd_set_my_capacity(mdev, p_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mdev->p_uuid && mdev->state.conn <= C_CONNECTED && get_ldev(mdev)) {
|
|
||||||
nconn = drbd_sync_handshake(mdev,
|
|
||||||
mdev->state.peer, mdev->state.pdsk);
|
|
||||||
put_ldev(mdev);
|
|
||||||
|
|
||||||
if (nconn == C_MASK) {
|
|
||||||
drbd_force_state(mdev, NS(conn, C_DISCONNECTING));
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (drbd_request_state(mdev, NS(conn, nconn)) < SS_SUCCESS) {
|
|
||||||
drbd_force_state(mdev, NS(conn, C_DISCONNECTING));
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (get_ldev(mdev)) {
|
if (get_ldev(mdev)) {
|
||||||
if (mdev->ldev->known_size != drbd_get_capacity(mdev->ldev->backing_bdev)) {
|
if (mdev->ldev->known_size != drbd_get_capacity(mdev->ldev->backing_bdev)) {
|
||||||
mdev->ldev->known_size = drbd_get_capacity(mdev->ldev->backing_bdev);
|
mdev->ldev->known_size = drbd_get_capacity(mdev->ldev->backing_bdev);
|
||||||
|
|
Reference in a new issue