diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-03-16 01:25:28 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:44:37 +0100 |
| commit | d4e67d7c4fa7989175910faac41ab6de77399cf6 (patch) | |
| tree | d17d579877b7c3a7f37f08946ea9d3be110a256b | |
| parent | 2f4e7abe5175cd17d74e41b9f4e8e04cd73342fb (diff) | |
drbd: drbd_send_b_ack(): Return void: the result is never used
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 4 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index b82ef880913..354c9ddb09d 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1181,8 +1181,8 @@ extern int conn_send_cmd(struct drbd_tconn *tconn, int vnr, struct drbd_socket * extern int conn_send_cmd2(struct drbd_tconn *tconn, enum drbd_packet cmd, char *data, size_t size); extern int drbd_send_sync_param(struct drbd_conf *mdev); -extern int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, - u32 set_size); +extern void drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, + u32 set_size); extern int drbd_send_ack(struct drbd_conf *, enum drbd_packet, struct drbd_peer_request *); extern int drbd_send_ack_rp(struct drbd_conf *mdev, enum drbd_packet cmd, diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index c91450260d8..5bff744897f 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1227,19 +1227,15 @@ int drbd_send_bitmap(struct drbd_conf *mdev) drbd_put_data_sock(mdev->tconn); return err; } - -int drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, u32 set_size) +void drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, u32 set_size) { - int ok; struct p_barrier_ack p; p.barrier = barrier_nr; p.set_size = cpu_to_be32(set_size); - if (mdev->state.conn < C_CONNECTED) - return false; - ok = !drbd_send_cmd(mdev, &mdev->tconn->meta, P_BARRIER_ACK, &p.head, sizeof(p)); - return ok; + if (mdev->state.conn >= C_CONNECTED) + drbd_send_cmd(mdev, &mdev->tconn->meta, P_BARRIER_ACK, &p.head, sizeof(p)); } /** |