[DRBD-cvs] drbd by lars; fallback to blk_run_queues() if blk_run_...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : lars
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	Makefile drbd_actlog.c drbd_compat_wrappers.h 


Log Message:
fallback to blk_run_queues() if blk_run_queue(q) won't work
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Makefile,v
retrieving revision 1.14.2.24
retrieving revision 1.14.2.25
diff -u -3 -r1.14.2.24 -r1.14.2.25
--- Makefile	3 Apr 2004 11:16:07 -0000	1.14.2.24
+++ Makefile	9 Apr 2004 06:53:43 -0000	1.14.2.25
@@ -136,7 +136,7 @@
   endif
 
   clean:
-	rm -f *.[oas] *.ko .*.cmd .*.d .*.tmp *.mod.c .*.flags .depend .kernelrelease
+	rm -f *.[oas] *.ko .*.cmd .*.d .*.tmp *.mod.c .*.flags .depend .kernel*
 
   distclean: clean
 
@@ -172,6 +172,6 @@
   endif
 
   depmod:
-	[ -e $(KDIR)/System.map ] && [ -e ./drbd.o ] && \
-	   /sbin/depmod -F $(KDIR)/System.map -e ./drbd.o 2>&1 >/dev/null
+	[ -e $(KDIR)/System.map ] && [ -e ./$(MODOBJ) ] && \
+	   /sbin/depmod -F $(KDIR)/System.map -e ./$(MODOBJ) 2>&1 >/dev/null
 endif
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_actlog.c,v
retrieving revision 1.1.2.82
retrieving revision 1.1.2.83
diff -u -3 -r1.1.2.82 -r1.1.2.83
--- drbd_actlog.c	29 Mar 2004 16:15:57 -0000	1.1.2.82
+++ drbd_actlog.c	9 Apr 2004 06:53:43 -0000	1.1.2.83
@@ -78,7 +78,7 @@
 	bio.bi_private = &event;
 	bio.bi_end_io = drbd_md_io_complete;
 	submit_bio(rw, &bio);
-	blk_run_queue(bdev_get_queue(mdev->md_bdev));
+	drbd_blk_run_queue(bdev_get_queue(mdev->md_bdev));
 	wait_for_completion(&event);
 
 	return test_bit(BIO_UPTODATE, &bio.bi_flags);
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.36
retrieving revision 1.1.2.37
diff -u -3 -r1.1.2.36 -r1.1.2.37
--- drbd_compat_wrappers.h	15 Mar 2004 17:32:19 -0000	1.1.2.36
+++ drbd_compat_wrappers.h	9 Apr 2004 06:53:43 -0000	1.1.2.37
@@ -509,9 +509,17 @@
 	generic_make_request(bio);
 }
 
+static inline void drbd_blk_run_queue(request_queue_t *q)
+{
+	if (q && q->queue_lock && q->request_fn)
+		blk_run_queue(q);
+	else
+		blk_run_queues();
+}
+
 static inline void drbd_kick_lo(drbd_dev *mdev)
 {
-	blk_run_queue(bdev_get_queue(mdev->backing_bdev)); 
+	drbd_blk_run_queue(bdev_get_queue(mdev->backing_bdev)); 
 }
 
 static inline void drbd_plug_device(drbd_dev *mdev)