diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2010-12-10 21:04:00 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 11:36:29 +0100 |
| commit | de1f8e4a0af3c2d0dff9f6341fead4b509941282 (patch) | |
| tree | e8bbbbdd18a11434c7608c9cf3ceaba0e3fe5ac2 /drivers/block | |
| parent | 4114be815f9811da42a21dc2f7ff552833660595 (diff) | |
| download | kernel_samsung_tuna-de1f8e4a0af3c2d0dff9f6341fead4b509941282.zip kernel_samsung_tuna-de1f8e4a0af3c2d0dff9f6341fead4b509941282.tar.gz kernel_samsung_tuna-de1f8e4a0af3c2d0dff9f6341fead4b509941282.tar.bz2 | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 44b102d..2a604e7 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -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 */ |