redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drbd: Get rid of the WORK_PENDING macro 

This macro doesn't add any value; just use test_bit() instead.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
hifive-unleashed-5.1
Andreas Gruenbacher 2014-09-11 14:29:10 +02:00 committed by Jens Axboe
parent d1b8085356
commit b47a06d105
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/block/drbd/drbd_worker.c
View File

@ -1931,19 +1931,18 @@ void __update_timing_details(
++(*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)
{
if (WORK_PENDING(MD_SYNC, todo))
if (test_bit(MD_SYNC, &todo))
do_md_sync(device);
if (WORK_PENDING(RS_DONE, todo) ||
WORK_PENDING(RS_PROGRESS, todo))
update_on_disk_bitmap(device, WORK_PENDING(RS_DONE, todo));
if (WORK_PENDING(GO_DISKLESS, todo))
if (test_bit(RS_DONE, &todo) ||
test_bit(RS_PROGRESS, &todo))
update_on_disk_bitmap(device, test_bit(RS_DONE, &todo));
if (test_bit(GO_DISKLESS, &todo))
go_diskless(device);
if (WORK_PENDING(DESTROY_DISK, todo))
if (test_bit(DESTROY_DISK, &todo))
drbd_ldev_destroy(device);
if (WORK_PENDING(RS_START, todo))
if (test_bit(RS_START, &todo))
do_start_resync(device);
}