drbd: receive_bitmap: Avoid casting enum drbd_state_rv to int
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
parent
4114be815f
commit
de1f8e4a0a
|
@ -3522,12 +3522,14 @@ static int receive_bitmap(struct drbd_conf *mdev, enum drbd_packets cmd, unsigne
|
||||||
INFO_bm_xfer_stats(mdev, "receive", &c);
|
INFO_bm_xfer_stats(mdev, "receive", &c);
|
||||||
|
|
||||||
if (mdev->state.conn == C_WF_BITMAP_T) {
|
if (mdev->state.conn == C_WF_BITMAP_T) {
|
||||||
|
enum drbd_state_rv rv;
|
||||||
|
|
||||||
ok = !drbd_send_bitmap(mdev);
|
ok = !drbd_send_bitmap(mdev);
|
||||||
if (!ok)
|
if (!ok)
|
||||||
goto out;
|
goto out;
|
||||||
/* Omit CS_ORDERED with this state transition to avoid deadlocks. */
|
/* Omit CS_ORDERED with this state transition to avoid deadlocks. */
|
||||||
ok = _drbd_request_state(mdev, NS(conn, C_WF_SYNC_UUID), CS_VERBOSE);
|
rv = _drbd_request_state(mdev, NS(conn, C_WF_SYNC_UUID), CS_VERBOSE);
|
||||||
D_ASSERT(ok == SS_SUCCESS);
|
D_ASSERT(rv == SS_SUCCESS);
|
||||||
} else if (mdev->state.conn != C_WF_BITMAP_S) {
|
} else if (mdev->state.conn != C_WF_BITMAP_S) {
|
||||||
/* admin may have requested C_DISCONNECTING,
|
/* admin may have requested C_DISCONNECTING,
|
||||||
* other threads may have noticed network errors */
|
* other threads may have noticed network errors */
|
||||||
|
|
Reference in New Issue