block: fix bad spelling of quiesce
Credit goes to Andrew Morton for spotting this one. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
@@ -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);
|
ssize_t ret = queue_var_store(&stats, page, count);
|
||||||
|
|
||||||
spin_lock_irq(q->queue_lock);
|
spin_lock_irq(q->queue_lock);
|
||||||
elv_quisce_start(q);
|
elv_quiesce_start(q);
|
||||||
|
|
||||||
if (stats)
|
if (stats)
|
||||||
queue_flag_set(QUEUE_FLAG_IO_STAT, q);
|
queue_flag_set(QUEUE_FLAG_IO_STAT, q);
|
||||||
else
|
else
|
||||||
queue_flag_clear(QUEUE_FLAG_IO_STAT, q);
|
queue_flag_clear(QUEUE_FLAG_IO_STAT, q);
|
||||||
|
|
||||||
elv_quisce_end(q);
|
elv_quiesce_end(q);
|
||||||
spin_unlock_irq(q->queue_lock);
|
spin_unlock_irq(q->queue_lock);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@@ -70,8 +70,8 @@ void blk_queue_congestion_threshold(struct request_queue *q);
|
|||||||
|
|
||||||
int blk_dev_init(void);
|
int blk_dev_init(void);
|
||||||
|
|
||||||
void elv_quisce_start(struct request_queue *q);
|
void elv_quiesce_start(struct request_queue *q);
|
||||||
void elv_quisce_end(struct request_queue *q);
|
void elv_quiesce_end(struct request_queue *q);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -590,7 +590,7 @@ void elv_drain_elevator(struct request_queue *q)
|
|||||||
/*
|
/*
|
||||||
* Call with queue lock held, interrupts disabled
|
* 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);
|
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);
|
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
|
* Turn on BYPASS and drain all requests w/ elevator private data
|
||||||
*/
|
*/
|
||||||
spin_lock_irq(q->queue_lock);
|
spin_lock_irq(q->queue_lock);
|
||||||
elv_quisce_start(q);
|
elv_quiesce_start(q);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Remember old elevator.
|
* Remember old elevator.
|
||||||
@@ -1150,7 +1150,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
|
|||||||
*/
|
*/
|
||||||
elevator_exit(old_elevator);
|
elevator_exit(old_elevator);
|
||||||
spin_lock_irq(q->queue_lock);
|
spin_lock_irq(q->queue_lock);
|
||||||
elv_quisce_end(q);
|
elv_quiesce_end(q);
|
||||||
spin_unlock_irq(q->queue_lock);
|
spin_unlock_irq(q->queue_lock);
|
||||||
|
|
||||||
blk_add_trace_msg(q, "elv switch: %s", e->elevator_type->elevator_name);
|
blk_add_trace_msg(q, "elv switch: %s", e->elevator_type->elevator_name);
|
||||||
|
Reference in New Issue
Block a user