---

yaml --- r: 254711 b: refs/heads/master c: 8ccee20 h: refs/heads/master i: 254709: 6cc1c43 254707: 4d61f53 254703: 7f3ff78 v: v3
git-mirror · Jun 30, 2011 · 8dd90d8 · 8dd90d8
1 parent 952dfd0
commit 8dd90d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 829c60878626be290a4c248e8f1b86a0d5cbd38b
+refs/heads/master: 8ccee20e3ef4e12dbf02a18f17d386569b1f73ee
diff --git a/trunk/drivers/block/drbd/drbd_bitmap.c b/trunk/drivers/block/drbd/drbd_bitmap.c
@@ -1400,8 +1400,10 @@ void _drbd_bm_set_bits(struct drbd_conf *mdev, const unsigned long s, const unsi
 	/* first and full pages, unless first page == last page */
 	for (page_nr = first_page; page_nr < last_page; page_nr++) {
 		bm_set_full_words_within_one_page(mdev->bitmap, page_nr, first_word, last_word);
-		cond_resched_lock(&b->bm_lock);
+		spin_unlock_irq(&b->bm_lock);
+		cond_resched();
 		first_word = 0;
+		spin_lock_irq(&b->bm_lock);
 	}
 
 	/* last page (respectively only page, for first page == last page) */