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>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 10438c41f559..43a9fefd29b8 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -85,8 +85,6 @@ void drbd_endio_read_sec_final(struct drbd_epoch_entry *e) __releases(local)
         unsigned long flags = 0;
         struct drbd_conf *mdev = e->mdev;
 
-        D_ASSERT(e->block_id != ID_VACANT);
-
         spin_lock_irqsave(&mdev->req_lock, flags);
         mdev->read_cnt += e->size >> 9;
         list_del(&e->w.list);
@@ -108,18 +106,16 @@ static void drbd_endio_write_sec_final(struct drbd_epoch_entry *e) __releases(lo
         struct drbd_conf *mdev = e->mdev;
         sector_t e_sector;
         int do_wake;
-        int is_syncer_req;
+        u64 block_id;
         int do_al_complete_io;
 
-        D_ASSERT(e->block_id != ID_VACANT);
-
         /* after we moved e to done_ee,
          * we may no longer access it,
          * it may be freed/reused already!
          * (as soon as we release the req_lock) */
         e_sector = e->sector;
         do_al_complete_io = e->flags & EE_CALL_AL_COMPLETE_IO;
-        is_syncer_req = is_syncer_block_id(e->block_id);
+        block_id = e->block_id;
 
         spin_lock_irqsave(&mdev->req_lock, flags);
         mdev->writ_cnt += e->size >> 9;
@@ -131,15 +127,13 @@ static void drbd_endio_write_sec_final(struct drbd_epoch_entry *e) __releases(lo
          * done from "drbd_process_done_ee" within the appropriate w.cb
          * (e_end_block/e_end_resync_block) or from _drbd_clear_done_ee */
 
-        do_wake = is_syncer_req
-                ? list_empty(&mdev->sync_ee)
-                : list_empty(&mdev->active_ee);
+        do_wake = list_empty(block_id == ID_SYNCER ? &mdev->sync_ee : &mdev->active_ee);
 
         if (test_bit(__EE_WAS_ERROR, &e->flags))
                 __drbd_chk_io_error(mdev, false);
         spin_unlock_irqrestore(&mdev->req_lock, flags);
 
-        if (is_syncer_req)
+        if (block_id == ID_SYNCER)
                 drbd_rs_complete_io(mdev, e_sector);
 
         if (do_wake)