summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorLars Ellenberg2016-06-14 00:26:37 +0200
committerJens Axboe2016-06-14 05:43:08 +0200
commit13c2088d41e9c63e1a484a08a1d250ff74b299b5 (patch)
tree975b4958b2009c7cd41f3d21a5b899a168416db8 /drivers/block/drbd
parentdrbd: get rid of empty statement in is_valid_state (diff)
downloadkernel-qcow2-linux-13c2088d41e9c63e1a484a08a1d250ff74b299b5.tar.gz
kernel-qcow2-linux-13c2088d41e9c63e1a484a08a1d250ff74b299b5.tar.xz
kernel-qcow2-linux-13c2088d41e9c63e1a484a08a1d250ff74b299b5.zip
drbd: finally report ms, not jiffies, in log message
Also skip the message unless bitmap IO took longer than 5 ms. 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>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_bitmap.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 095625beaf98..0807fcbf863d 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -1121,10 +1121,14 @@ static int bm_rw(struct drbd_device *device, const unsigned int flags, unsigned
kref_put(&ctx->kref, &drbd_bm_aio_ctx_destroy);
/* summary for global bitmap IO */
- if (flags == 0)
- drbd_info(device, "bitmap %s of %u pages took %lu jiffies\n",
- (flags & BM_AIO_READ) ? "READ" : "WRITE",
- count, jiffies - now);
+ if (flags == 0) {
+ unsigned int ms = jiffies_to_msecs(jiffies - now);
+ if (ms > 5) {
+ drbd_info(device, "bitmap %s of %u pages took %u ms\n",
+ (flags & BM_AIO_READ) ? "READ" : "WRITE",
+ count, ms);
+ }
+ }
if (ctx->error) {
drbd_alert(device, "we had at least one MD IO ERROR during bitmap IO\n");