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

Commit de1f8e4a authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: receive_bitmap: Avoid casting enum drbd_state_rv to int 



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

drivers/block/drbd/drbd_receiver.c

+4 −2
Original line number Diff line number Diff line
@@ -3522,12 +3522,14 @@ static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packets cmd, unsigne 
	INFO_bm_xfer_stats(mdev, "receive", &c);



	if (mdev->state.conn == C_WF_BITMAP_T) {

		enum drbd_state_rv rv;



		ok = !drbd_send_bitmap(mdev);

		if (!ok)

			goto out;

		/* Omit CS_ORDERED with this state transition to avoid deadlocks. */

		ok = _drbd_request_state(mdev, NS(conn, C_WF_SYNC_UUID), CS_VERBOSE);

		D_ASSERT(ok == SS_SUCCESS);

		rv = _drbd_request_state(mdev, NS(conn, C_WF_SYNC_UUID), CS_VERBOSE);

		D_ASSERT(rv == SS_SUCCESS);

	} else if (mdev->state.conn != C_WF_BITMAP_S) {

		/* admin may have requested C_DISCONNECTING,

		 * other threads may have noticed network errors */