Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3fe30b0 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: cleanup: This code path to trigger a resync is no longer needed 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 8d4ce82b

drivers/block/drbd/drbd_receiver.c

+0 −17
Original line number Diff line number Diff line
@@ -2853,7 +2853,6 @@ static int receive_sizes(struct drbd_conf *mdev, struct p_header *h) 
	unsigned int max_seg_s;

	sector_t p_size, p_usize, my_usize;

	int ldsc = 0; /* local disk size changed */

	enum drbd_conns nconn;



	ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return FALSE;

	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);

	}



	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 (mdev->ldev->known_size != drbd_get_capacity(mdev->ldev->backing_bdev)) {

			mdev->ldev->known_size = drbd_get_capacity(mdev->ldev->backing_bdev);