From: Nick Piggin <piggin@cyberone.com.au>

Jens said this debug crap should just be removed.



 drivers/block/as-iosched.c |   36 ------------------------------------
 1 files changed, 36 deletions(-)

diff -puN drivers/block/as-iosched.c~as-remove-debug-checks drivers/block/as-iosched.c
--- 25/drivers/block/as-iosched.c~as-remove-debug-checks	2003-04-25 12:40:09.000000000 -0700
+++ 25-akpm/drivers/block/as-iosched.c	2003-04-25 12:40:09.000000000 -0700
@@ -131,10 +131,6 @@ struct as_data {
 	unsigned long fifo_expire[2];
 	unsigned long batch_expire[2];
 	unsigned long antic_expire;
-
-	int read_outstanding;	/* DEBUG the completion notifier */
-	int write_outstanding;
-	int quiet;
 };
 
 #define list_entry_fifo(ptr)	list_entry((ptr), struct as_rq, fifo)
@@ -879,20 +875,6 @@ static void as_completed_request(request
 		return;
 	}
 
-	if (rq_data_dir(rq) == READ) {
-		ad->read_outstanding--;
-		if (!ad->quiet && ad->read_outstanding < 0) {
-			WARN_ON(1);
-			ad->quiet = 1;
-		}
-	} else {
-		ad->write_outstanding--;
-		if (!ad->quiet && ad->write_outstanding < 0) {
-			WARN_ON(1);
-			ad->quiet = 1;
-		}
-	}
-
 	if (!aic)
 		return;
 
@@ -1193,7 +1175,6 @@ static struct request *as_next_request(r
 	return rq;
 }
 
-extern int queue_nr_requests; /* DEBUG completion notifier */
 /*
  * add arq to rbtree and fifo
  */
@@ -1201,23 +1182,6 @@ static void as_add_request(struct as_dat
 {
 	const int data_dir = rq_data_dir(arq->request);
 
-	struct request_list *rl = ad->q->rq + data_dir;
-	int nr = queue_nr_requests - rl->count;
-
-	if (data_dir == READ) {
-		ad->read_outstanding++;
-		if (!ad->quiet && ad->read_outstanding > nr) {
-			WARN_ON(1);
-			ad->quiet = 1;
-		}
-	} else {
-		ad->write_outstanding++;
-		if (!ad->quiet && ad->write_outstanding > nr) {
-			WARN_ON(1);
-			ad->quiet = 1;
-		}
-	}
-
 	arq->as_io_context = get_as_io_context();
 
 	if (arq->as_io_context) {

_