[DRBD-cvs] svn commit by lars - r2980 - branches/drbd-8.0-for-linus/drbd - equivalet of 31bd956bd9dccf93b714fdd3cf8671b78433993a D

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-07-23 17:55:14 +0200 (Mon, 23 Jul 2007)
New Revision: 2980

Modified:
   branches/drbd-8.0-for-linus/drbd/drbd_int.h
   branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
Log:
equivalet of 31bd956bd9dccf93b714fdd3cf8671b78433993a DRBD: remove non-working distributed TCQ

Modified: branches/drbd-8.0-for-linus/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_int.h	2007-07-23 15:51:45 UTC (rev 2979)
+++ branches/drbd-8.0-for-linus/drbd/drbd_int.h	2007-07-23 15:55:14 UTC (rev 2980)
@@ -1877,18 +1877,9 @@
 
 static inline int drbd_queue_order_type(drbd_dev* mdev)
 {
-	int rv;
-#if !defined(QUEUE_FLAG_ORDERED)
-	ERR_IF(mdev->bc == NULL) return QUEUE_ORDERED_NONE;
-	rv = bdev_get_queue(mdev->bc->backing_bdev)->ordered;
-#else
-# define QUEUE_ORDERED_NONE 0
-# define QUEUE_ORDERED_TAG 1
-# define QUEUE_ORDERED_FLUSH 2
-# warning "TCQ code disabled at compile time."
-	rv = QUEUE_ORDERED_NONE; // Kernels before 2.6.12 had not had TCQ support.
-#endif
-	return rv;
+	/* sorry, we currently have no working implementation
+	 * of distributed TCQ stuff */
+	return QUEUE_ORDERED_NONE;
 }
 
 /*

Modified: branches/drbd-8.0-for-linus/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0-for-linus/drbd/drbd_receiver.c	2007-07-23 15:51:45 UTC (rev 2979)
+++ branches/drbd-8.0-for-linus/drbd/drbd_receiver.c	2007-07-23 15:55:14 UTC (rev 2980)
@@ -865,40 +865,6 @@
 	return TRUE;
 }
 
-#if 0
-STATIC int receive_Barrier_tcq(drbd_dev *mdev, Drbd_Header* h)
-{
-	int rv;
-	int epoch_size=0;
-	Drbd_Barrier_Packet *p = (Drbd_Barrier_Packet*)h;
-
-	ERR_IF(h->length != (sizeof(*p)-sizeof(*h))) return false;
-
-	rv = drbd_recv(mdev, h->payload, h->length);
-	ERR_IF(rv != h->length) return false;
-
-	inc_unacked(mdev);
-
-	spin_lock_irq(&mdev->ee_lock);
-	if(list_empty(&mdev->active_ee)) {
-		epoch_size = mdev->epoch_size;
-		mdev->epoch_size = 0;
-	} else if (mdev->last_write_w_barrier) {
-		mdev->last_write_w_barrier->barrier_nr2 = be32_to_cpu(p->barrier);
-	} else {
-		mdev->next_barrier_nr = be32_to_cpu(p->barrier);
-	}
-	spin_unlock_irq(&mdev->ee_lock);
-
-	if(epoch_size) {
-		rv = drbd_send_b_ack(mdev, p->barrier, epoch_size);
-		dec_unacked(mdev);
-	}
-
-	return rv;
-}
-#endif
-
 STATIC int receive_Barrier_no_tcq(drbd_dev *mdev, Drbd_Header* h)
 {
 	int rv;
@@ -2157,36 +2123,8 @@
 
 STATIC void drbd_setup_order_type(drbd_dev *mdev, int peer)
 {
-#if 0
-	int self = drbd_queue_order_type(mdev);
-	int type;
-
-	static char *order_txt[] = {
-		[QUEUE_ORDERED_NONE]  = "none - oldIDE",
-		[QUEUE_ORDERED_FLUSH] = "flush - IDE",
-		[QUEUE_ORDERED_TAG]   = "tag - TCQ",
-	};
-
-	if(self == QUEUE_ORDERED_NONE ||
-	   peer == QUEUE_ORDERED_NONE) {
-		type = QUEUE_ORDERED_NONE;
-	} else if (self == QUEUE_ORDERED_FLUSH ||
-		   peer == QUEUE_ORDERED_FLUSH) {
-		type = QUEUE_ORDERED_FLUSH;
-	} else if(self == QUEUE_ORDERED_TAG ||
-		  peer == QUEUE_ORDERED_TAG) {
-		type = QUEUE_ORDERED_TAG;
-	} else {
-		D_ASSERT(0);
-		type = QUEUE_ORDERED_NONE;
-	}
-
-	if (type != self ) {
-		INFO("Exposing an order type of '%s' to the kernel\n",
-		     order_txt[type]);
-		blk_queue_ordered(mdev->rq_queue,type);
-	}
-#endif
+	/* sorry, we currently have no working implementation
+	 * of distributed TCQ */
 }
 
 /* warn if the arguments differ by more than 12.5% */
@@ -2592,27 +2530,6 @@
 static drbd_cmd_handler_f *drbd_cmd_handler = drbd_default_handler;
 static drbd_cmd_handler_f *drbd_opt_cmd_handler = NULL;
 
-#if 0
-	/* FIXME lge thinks the implementation of barrier handling via
-	 * tcq is currently broken */
-void drbd_set_recv_tcq(drbd_dev * mdev, int tcq_enabled)
-{
-// warning LGE "FIXME make drbd_cmd_handler a member of mdev"
-	if(tcq_enabled &&
-	   drbd_default_handler[Barrier] != receive_Barrier_tcq) {
-		INFO("Enabling TCQ for barrier processing on backend.\n");
-		drbd_default_handler[Barrier] = receive_Barrier_tcq;
-	}
-
-	if(!tcq_enabled &&
-	   drbd_default_handler[Barrier] != receive_Barrier_usual) {
-		INFO("Using conventional (non TCQ) barrier processing"
-		     " on backend.\n");
-		drbd_default_handler[Barrier] = receive_Barrier_usual;
-	}
-}
-#endif
-
 STATIC void drbdd(drbd_dev *mdev)
 {
 	drbd_cmd_handler_f handler;