summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher2011-01-13 18:40:57 +0100
committerPhilipp Reisner2011-08-25 14:57:57 +0200
commit579b57ed730819970a3542b4bbcc2d4176f25c72 (patch)
tree379b7f54b595abfa7aa6db893ddf757e13625ed9 /drivers/block/drbd/drbd_receiver.c
parentdrbd: Endianness convert the constants instead of the variables (diff)
downloadkernel-qcow2-linux-579b57ed730819970a3542b4bbcc2d4176f25c72.tar.gz
kernel-qcow2-linux-579b57ed730819970a3542b4bbcc2d4176f25c72.tar.xz
kernel-qcow2-linux-579b57ed730819970a3542b4bbcc2d4176f25c72.zip
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.c4
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)
update_peer_seq(mdev, be32_to_cpu(p->seq_num));
- if (is_syncer_block_id(p->block_id)) {
+ if (p->block_id == ID_SYNCER) {
drbd_set_in_sync(mdev, sector, blksize);
dec_rs_pending(mdev);
return true;
@@ -4349,7 +4349,7 @@ static int got_NegAck(struct drbd_conf *mdev, struct p_header80 *h)
update_peer_seq(mdev, be32_to_cpu(p->seq_num));
- if (is_syncer_block_id(p->block_id)) {
+ if (p->block_id == ID_SYNCER) {
dec_rs_pending(mdev);
drbd_rs_failed_io(mdev, sector, size);
return true;