[DRBD-cvs] svn commit by phil - r2153 - trunk/drbd - Fixed the bitmap code in case our backing device is a m

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-04-18 22:07:40 +0200 (Tue, 18 Apr 2006)
New Revision: 2153

Modified:
   trunk/drbd/drbd_bitmap.c
Log:
Fixed the bitmap code in case our backing device is a mapping-style
block device, like LVM etc...


Modified: trunk/drbd/drbd_bitmap.c
===================================================================
--- trunk/drbd/drbd_bitmap.c	2006-04-18 20:05:31 UTC (rev 2152)
+++ trunk/drbd/drbd_bitmap.c	2006-04-18 20:07:40 UTC (rev 2153)
@@ -734,6 +734,7 @@
 	int bm_words, num_pages, i;
 	unsigned long now;
 	char ppb[10];
+	request_queue_t *q;
 
 	MUST_BE_LOCKED();
 
@@ -756,8 +757,8 @@
 		/* let the layers below us try to merge these bios... */
 		drbd_bm_page_io_async(mdev,b,i,rw);
 	}
-
-	blk_run_queue(bdev_get_queue(mdev->bc->md_bdev));
+	q=bdev_get_queue(mdev->bc->md_bdev);
+	if(q->request_fn) blk_run_queue(q);
 	wait_event(b->bm_io_wait, atomic_read(&b->bm_async_io) == 0);
 	INFO("%s of bitmap took %lu jiffies\n", 
 	     rw == READ ? "reading" : "writing", jiffies - now);