From 205330de2bcbbb1812a131037268f415fb4660bb Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 8 Apr 2009 14:22:01 +0200
Subject: [PATCH] --- yaml --- r: 143323 b: refs/heads/master c:
 f600abe2de81628c40effbb3f8eaf5af0d291e57 h: refs/heads/master i:   143321:
 22e59a5cca6b9b1e23bebab076f563fd8e29a377   143319:
 7a11359b6a23c64ed7fb10de6a711c0ca47df555 v: v3

---
 [refs]                  | 2 +-
 trunk/block/blk-sysfs.c | 4 ++--
 trunk/block/blk.h       | 4 ++--
 trunk/block/elevator.c  | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9bf46d2cff6f..b9dd21321fd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f3d8ba20e67991b531e9c0227dcd1f99271a32c
+refs/heads/master: f600abe2de81628c40effbb3f8eaf5af0d291e57
diff --git a/trunk/block/blk-sysfs.c b/trunk/block/blk-sysfs.c
index 73f36beff5cd..cac4e9febe6a 100644
--- a/trunk/block/blk-sysfs.c
+++ b/trunk/block/blk-sysfs.c
@@ -209,14 +209,14 @@ static ssize_t queue_iostats_store(struct request_queue *q, const char *page,
 	ssize_t ret = queue_var_store(&stats, page, count);
 
 	spin_lock_irq(q->queue_lock);
-	elv_quisce_start(q);
+	elv_quiesce_start(q);
 
 	if (stats)
 		queue_flag_set(QUEUE_FLAG_IO_STAT, q);
 	else
 		queue_flag_clear(QUEUE_FLAG_IO_STAT, q);
 
-	elv_quisce_end(q);
+	elv_quiesce_end(q);
 	spin_unlock_irq(q->queue_lock);
 
 	return ret;
diff --git a/trunk/block/blk.h b/trunk/block/blk.h
index 24fcaeeaf620..5dfc41267a08 100644
--- a/trunk/block/blk.h
+++ b/trunk/block/blk.h
@@ -70,8 +70,8 @@ void blk_queue_congestion_threshold(struct request_queue *q);
 
 int blk_dev_init(void);
 
-void elv_quisce_start(struct request_queue *q);
-void elv_quisce_end(struct request_queue *q);
+void elv_quiesce_start(struct request_queue *q);
+void elv_quiesce_end(struct request_queue *q);
 
 
 /*
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index fb81bcc14a8c..7073a9072577 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -590,7 +590,7 @@ void elv_drain_elevator(struct request_queue *q)
 /*
  * Call with queue lock held, interrupts disabled
  */
-void elv_quisce_start(struct request_queue *q)
+void elv_quiesce_start(struct request_queue *q)
 {
 	queue_flag_set(QUEUE_FLAG_ELVSWITCH, q);
 
@@ -607,7 +607,7 @@ void elv_quisce_start(struct request_queue *q)
 	}
 }
 
-void elv_quisce_end(struct request_queue *q)
+void elv_quiesce_end(struct request_queue *q)
 {
 	queue_flag_clear(QUEUE_FLAG_ELVSWITCH, q);
 }
@@ -1126,7 +1126,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
 	 * Turn on BYPASS and drain all requests w/ elevator private data
 	 */
 	spin_lock_irq(q->queue_lock);
-	elv_quisce_start(q);
+	elv_quiesce_start(q);
 
 	/*
 	 * Remember old elevator.
@@ -1150,7 +1150,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
 	 */
 	elevator_exit(old_elevator);
 	spin_lock_irq(q->queue_lock);
-	elv_quisce_end(q);
+	elv_quiesce_end(q);
 	spin_unlock_irq(q->queue_lock);
 
 	blk_add_trace_msg(q, "elv switch: %s", e->elevator_type->elevator_name);