diff --git a/[refs] b/[refs] index 4f21a5890561..d1e4bb7d8470 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e89b591c3aba0af87f5248b15f56ce7a4f439c16 +refs/heads/master: fd76438c2421324fa2fb9303e760ec5332ff0b58 diff --git a/trunk/drivers/block/drbd/drbd_bitmap.c b/trunk/drivers/block/drbd/drbd_bitmap.c index 695fb64cba00..178cf1642b2d 100644 --- a/trunk/drivers/block/drbd/drbd_bitmap.c +++ b/trunk/drivers/block/drbd/drbd_bitmap.c @@ -84,6 +84,9 @@ struct drbd_bitmap { #define BM_MD_IO_ERROR 1 #define BM_P_VMALLOCED 2 +int __bm_change_bits_to(struct drbd_conf *mdev, const unsigned long s, + unsigned long e, int val, const enum km_type km); + static int bm_is_locked(struct drbd_bitmap *b) { return test_bit(BM_LOCKED, &b->bm_flags); @@ -529,6 +532,9 @@ 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);