From 6c07cb56c273982dde6bb0506c9fbfd34eefa3c7 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Tue, 14 Jun 2011 14:18:23 +0200
Subject: [PATCH] --- yaml --- r: 254712 b: refs/heads/master c:
 5a8b424276f7ba50c51e7caf485b2be23739e5b8 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/block/drbd/drbd_bitmap.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0f87458c952..46100dbf7f79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ccee20e3ef4e12dbf02a18f17d386569b1f73ee
+refs/heads/master: 5a8b424276f7ba50c51e7caf485b2be23739e5b8
diff --git a/trunk/drivers/block/drbd/drbd_bitmap.c b/trunk/drivers/block/drbd/drbd_bitmap.c
index 61f4fae9f67e..7b976296b564 100644
--- a/trunk/drivers/block/drbd/drbd_bitmap.c
+++ b/trunk/drivers/block/drbd/drbd_bitmap.c
@@ -991,6 +991,9 @@ static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must
 		bio_endio(bio, -EIO);
 	} else {
 		submit_bio(rw, bio);
+		/* this should not count as user activity and cause the
+		 * resync to throttle -- see drbd_rs_should_slow_down(). */
+		atomic_add(len >> 9, &mdev->rs_sect_ev);
 	}
 }