Commit b47a06d1 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jens Axboe

drbd: Get rid of the WORK_PENDING macro

This macro doesn't add any value; just use test_bit() instead.
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d1b80853
...@@ -1931,19 +1931,18 @@ void __update_timing_details( ...@@ -1931,19 +1931,18 @@ void __update_timing_details(
++(*cb_nr); ++(*cb_nr);
} }
#define WORK_PENDING(work_bit, todo) (todo & (1UL << work_bit))
static void do_device_work(struct drbd_device *device, const unsigned long todo) static void do_device_work(struct drbd_device *device, const unsigned long todo)
{ {
if (WORK_PENDING(MD_SYNC, todo)) if (test_bit(MD_SYNC, &todo))
do_md_sync(device); do_md_sync(device);
if (WORK_PENDING(RS_DONE, todo) || if (test_bit(RS_DONE, &todo) ||
WORK_PENDING(RS_PROGRESS, todo)) test_bit(RS_PROGRESS, &todo))
update_on_disk_bitmap(device, WORK_PENDING(RS_DONE, todo)); update_on_disk_bitmap(device, test_bit(RS_DONE, &todo));
if (WORK_PENDING(GO_DISKLESS, todo)) if (test_bit(GO_DISKLESS, &todo))
go_diskless(device); go_diskless(device);
if (WORK_PENDING(DESTROY_DISK, todo)) if (test_bit(DESTROY_DISK, &todo))
drbd_ldev_destroy(device); drbd_ldev_destroy(device);
if (WORK_PENDING(RS_START, todo)) if (test_bit(RS_START, &todo))
do_start_resync(device); do_start_resync(device);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment