diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-01-13 12:40:57 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-08-25 08:57:57 -0400 |
commit | 579b57ed730819970a3542b4bbcc2d4176f25c72 (patch) | |
tree | 379b7f54b595abfa7aa6db893ddf757e13625ed9 /drivers/block/drbd/drbd_receiver.c | |
parent | e7fad8af750c5780143e4b6876f80042ec0c21f5 (diff) |
drbd: Magic reserved block_id value cleanup
The ID_VACANT definition has become entirely irrelevant by now.
The is_syncer_block_id() macro does not improve the code, so eliminated
it.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 69eec6980c29..efe141eb521b 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -4308,7 +4308,7 @@ static int got_BlockAck(struct drbd_conf *mdev, struct p_header80 *h) | |||
4308 | 4308 | ||
4309 | update_peer_seq(mdev, be32_to_cpu(p->seq_num)); | 4309 | update_peer_seq(mdev, be32_to_cpu(p->seq_num)); |
4310 | 4310 | ||
4311 | if (is_syncer_block_id(p->block_id)) { | 4311 | if (p->block_id == ID_SYNCER) { |
4312 | drbd_set_in_sync(mdev, sector, blksize); | 4312 | drbd_set_in_sync(mdev, sector, blksize); |
4313 | dec_rs_pending(mdev); | 4313 | dec_rs_pending(mdev); |
4314 | return true; | 4314 | return true; |
@@ -4349,7 +4349,7 @@ static int got_NegAck(struct drbd_conf *mdev, struct p_header80 *h) | |||
4349 | 4349 | ||
4350 | update_peer_seq(mdev, be32_to_cpu(p->seq_num)); | 4350 | update_peer_seq(mdev, be32_to_cpu(p->seq_num)); |
4351 | 4351 | ||
4352 | if (is_syncer_block_id(p->block_id)) { | 4352 | if (p->block_id == ID_SYNCER) { |
4353 | dec_rs_pending(mdev); | 4353 | dec_rs_pending(mdev); |
4354 | drbd_rs_failed_io(mdev, sector, size); | 4354 | drbd_rs_failed_io(mdev, sector, size); |
4355 | return true; | 4355 | return true; |