commit 391b8a351bb5e5b1777e944340ea5c19ebaf17ca
author Jens Axboe <jaxboe@fusionio.com> Thu Jan 20 22:10:19 2011 -0700
committer Jens Axboe <jaxboe@fusionio.com> Thu Jan 20 22:10:19 2011 -0700
tree b160839d5104f0f5af7edfa604ecd436ee9e2aaf
parent aa32a3b4d842335ce26d6c00e373ca2284df6912

block: foo fixup

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

block/blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 4a8a976..58630ef 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -232,7 +232,9 @@
 	spin_lock_irq(q->queue_lock);
 	__blk_run_queue(q);
 	spin_unlock_irq(q->queue_lock);
+#if 0
 	blk_put_queue(q);
+#endif
 }
 
 /**
@@ -247,12 +249,18 @@
  */
 int blk_delay_queue(struct request_queue *q, unsigned long msecs)
 {
+#if 0
 	if (!blk_get_queue(q)) {
 		schedule_delayed_work(&q->delay_work, msecs_to_jiffies(msecs));
 		return 0;
 	}
 
 	return 1;
+#else
+
+	schedule_delayed_work(&q->delay_work, msecs_to_jiffies(msecs));
+	return 0;
+#endif
 }
 EXPORT_SYMBOL(blk_delay_queue);
 
@@ -313,7 +321,7 @@
 {
 	del_timer_sync(&q->timeout);
 	throtl_shutdown_timer_wq(q);
-	cancel_delayed_work_sync(&q->delay_work);
+	cancel_delayed_work(&q->delay_work);
 	queue_sync_plugs(q);
 }
 EXPORT_SYMBOL(blk_sync_queue);
@@ -1300,9 +1308,8 @@
 				plug->should_sort = 1;
 		}
 		req->cmd_flags |= REQ_ON_PLUG;
-		preempt_disable();
 		list_add_tail(&req->queuelist, &plug->list);
-		preempt_enable();
+		drive_stat_acct(req, 1);
 	} else {
 		spin_lock_irq(q->queue_lock);
 		add_acct_request(q, req, where);