From: Philipp Reisner <philipp.reisner@linbit.com>
To: Jens Axboe <axboe@kernel.dk>, linux-kernel@vger.kernel.org
Cc: drbd-dev@lists.linbit.com
Subject: [PATCH 6/9] drbd: Get rid of the WORK_PENDING macro
Date: Thu, 11 Sep 2014 14:29:10 +0200 [thread overview]
Message-ID: <1410438553-30440-7-git-send-email-philipp.reisner@linbit.com> (raw)
In-Reply-To: <1410438553-30440-1-git-send-email-philipp.reisner@linbit.com>
From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
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>
---
drivers/block/drbd/drbd_worker.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index b20cd21..3b74f08 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -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);
}
--
1.9.1
next prev parent reply other threads:[~2014-09-11 12:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-11 12:29 [PATCH 0/9] DRBD updates for 3.18 Philipp Reisner
2014-09-11 12:29 ` [PATCH 1/9] drbd: Use better variable names Philipp Reisner
2014-09-11 12:29 ` [PATCH 2/9] drbd: Use consistent names for all the bi_end_io callbacks Philipp Reisner
2014-09-11 12:29 ` [PATCH 3/9] drbd: Remove superfluous newline from "resync_extents" debugfs entry Philipp Reisner
2014-09-11 12:29 ` [PATCH 4/9] drbd: Avoid inconsistent locking warning Philipp Reisner
2014-09-11 12:29 ` [PATCH 5/9] drbd: Get rid of the __no_warn and __cond_lock macros Philipp Reisner
2014-09-11 12:29 ` Philipp Reisner [this message]
2014-09-11 12:29 ` [PATCH 7/9] drbd: Improve asender performance Philipp Reisner
2014-09-11 12:29 ` [PATCH 8/9] drbd: reduce lock contention in drbd_worker Philipp Reisner
2014-09-11 12:29 ` [PATCH 9/9] drbd: Add missing newline in resync progress display in /proc/drbd Philipp Reisner
2014-09-11 15:12 ` [PATCH 0/9] DRBD updates for 3.18 Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410438553-30440-7-git-send-email-philipp.reisner@linbit.com \
--to=philipp.reisner@linbit.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®