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

Commit 25b0d6c8 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Reinstate disabling AL updates with invalidate-remote 



Commit d0ef827e (drbd: switch configuration interface from connector to
genetlink) introduced a regression by removing the ability to set all
bits in the out of sync bitmap and to suspend updates to the activity log
of a disconnected device via the invalidate-remote management call.

Credits for reporting the issue are going to Arne Redlich.

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

drivers/block/drbd/drbd_nl.c

+39 −1
Original line number Original line Diff line number Diff line
@@ -2410,9 +2410,47 @@ static int drbd_adm_simple_request_state(struct sk_buff *skb, struct genl_info * 
	return 0;

	return 0;

}

}





static int drbd_bmio_set_susp_al(struct drbd_conf *mdev)

{

	int rv;



	rv = drbd_bmio_set_n_write(mdev);

	drbd_suspend_al(mdev);

	return rv;

}



int drbd_adm_invalidate_peer(struct sk_buff *skb, struct genl_info *info)

int drbd_adm_invalidate_peer(struct sk_buff *skb, struct genl_info *info)

{

{

	return drbd_adm_simple_request_state(skb, info, NS(conn, C_STARTING_SYNC_S));

	int retcode; /* drbd_ret_code, drbd_state_rv */

	struct drbd_conf *mdev;



	retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_MINOR);

	if (!adm_ctx.reply_skb)

		return retcode;

	if (retcode != NO_ERROR)

		goto out;



	mdev = adm_ctx.mdev;



	retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S), CS_ORDERED);

	if (retcode < SS_SUCCESS) {

		if (retcode == SS_NEED_CONNECTION && mdev->state.role == R_PRIMARY) {

			/* The peer will get a resync upon connect anyways.

			 * Just make that into a full resync. */

			retcode = drbd_request_state(mdev, NS(pdsk, D_INCONSISTENT));

			if (retcode >= SS_SUCCESS) {

				if (drbd_bitmap_io(mdev, &drbd_bmio_set_susp_al,

						   "set_n_write from invalidate_peer",

						   BM_LOCKED_SET_ALLOWED))

					retcode = ERR_IO_MD_DISK;

			}

		} else

			retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S));

	}



out:

	drbd_adm_finish(info, retcode);

	return 0;

}

}





int drbd_adm_pause_sync(struct sk_buff *skb, struct genl_info *info)

int drbd_adm_pause_sync(struct sk_buff *skb, struct genl_info *info)

drivers/block/drbd/drbd_state.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -628,6 +628,11 @@ is_valid_conn_transition(enum drbd_conns oc, enum drbd_conns nc) 
	if (oc == C_STANDALONE && nc != C_UNCONNECTED)

	if (oc == C_STANDALONE && nc != C_UNCONNECTED)

		return SS_NEED_CONNECTION;

		return SS_NEED_CONNECTION;





	/* When establishing a connection we need to go through WF_REPORT_PARAMS!

	   Necessary to do the right thing upon invalidate-remote on a disconnected resource */

	if (oc < C_WF_REPORT_PARAMS && nc >= C_CONNECTED)

		return SS_NEED_CONNECTION;



	/* After a network error only C_UNCONNECTED or C_DISCONNECTING may follow. */

	/* After a network error only C_UNCONNECTED or C_DISCONNECTING may follow. */

	if (oc >= C_TIMEOUT && oc <= C_TEAR_DOWN && nc != C_UNCONNECTED && nc != C_DISCONNECTING)

	if (oc >= C_TIMEOUT && oc <= C_TEAR_DOWN && nc != C_UNCONNECTED && nc != C_DISCONNECTING)

		return SS_IN_TRANSIENT_STATE;

		return SS_IN_TRANSIENT_STATE;