From 5ec0e0c36e5c2d790918a76d1d953e33fe9fa39e Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 28 Apr 2010 14:46:57 +0200 Subject: [PATCH] --- yaml --- r: 196852 b: refs/heads/master c: 5223671bb0315d83f9ad7becbbb9e703aa735bbe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_bitmap.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6eb1db766214..4999c475c306 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b4388ac1f282515db3a651707238cad00b50e80 +refs/heads/master: 5223671bb0315d83f9ad7becbbb9e703aa735bbe diff --git a/trunk/drivers/block/drbd/drbd_bitmap.c b/trunk/drivers/block/drbd/drbd_bitmap.c index aa7e23cf7e22..e3f88d6e1412 100644 --- a/trunk/drivers/block/drbd/drbd_bitmap.c +++ b/trunk/drivers/block/drbd/drbd_bitmap.c @@ -519,7 +519,7 @@ int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits) obits = b->bm_bits; growing = bits > obits; - if (opages) + if (opages && growing && set_new_bits) bm_set_surplus(b); b->bm_pages = npages; @@ -532,9 +532,6 @@ int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits) if (set_new_bits) { bm_memset(b, owords, 0xff, words-owords); b->bm_set += bits - obits; - __bm_change_bits_to(mdev, obits, - ALIGN(obits, BITS_PER_LONG), - 1, KM_IRQ1); } else bm_memset(b, owords, 0x00, words-owords);