From 8dd90d824e3f7449f8dd4ea058b50aa41106c015 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 6 Jun 2011 11:31:42 +0200 Subject: [PATCH] --- yaml --- r: 254711 b: refs/heads/master c: 8ccee20e3ef4e12dbf02a18f17d386569b1f73ee h: refs/heads/master i: 254709: 6cc1c431485bfa5253237841b3c5683727f667a1 254707: 4d61f53324a6ae1501ce45a00e2f4ad9b5470364 254703: 7f3ff78d72aa1b3af972f27f545d0a4a17469dfa v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_bitmap.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 426c0fba6ed5..b0f87458c952 100644 --- 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 index 1e89a74ddb17..61f4fae9f67e 100644 --- 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) */