diff options
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c index fb81bcc14a8c..7073a9072577 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -590,7 +590,7 @@ void elv_drain_elevator(struct request_queue *q) | |||
| 590 | /* | 590 | /* |
| 591 | * Call with queue lock held, interrupts disabled | 591 | * Call with queue lock held, interrupts disabled |
| 592 | */ | 592 | */ |
| 593 | void elv_quisce_start(struct request_queue *q) | 593 | void elv_quiesce_start(struct request_queue *q) |
| 594 | { | 594 | { |
| 595 | queue_flag_set(QUEUE_FLAG_ELVSWITCH, q); | 595 | queue_flag_set(QUEUE_FLAG_ELVSWITCH, q); |
| 596 | 596 | ||
| @@ -607,7 +607,7 @@ void elv_quisce_start(struct request_queue *q) | |||
| 607 | } | 607 | } |
| 608 | } | 608 | } |
| 609 | 609 | ||
| 610 | void elv_quisce_end(struct request_queue *q) | 610 | void elv_quiesce_end(struct request_queue *q) |
| 611 | { | 611 | { |
| 612 | queue_flag_clear(QUEUE_FLAG_ELVSWITCH, q); | 612 | queue_flag_clear(QUEUE_FLAG_ELVSWITCH, q); |
| 613 | } | 613 | } |
| @@ -1126,7 +1126,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e) | |||
| 1126 | * Turn on BYPASS and drain all requests w/ elevator private data | 1126 | * Turn on BYPASS and drain all requests w/ elevator private data |
| 1127 | */ | 1127 | */ |
| 1128 | spin_lock_irq(q->queue_lock); | 1128 | spin_lock_irq(q->queue_lock); |
| 1129 | elv_quisce_start(q); | 1129 | elv_quiesce_start(q); |
| 1130 | 1130 | ||
| 1131 | /* | 1131 | /* |
| 1132 | * Remember old elevator. | 1132 | * Remember old elevator. |
| @@ -1150,7 +1150,7 @@ static int elevator_switch(struct request_queue *q, struct elevator_type *new_e) | |||
| 1150 | */ | 1150 | */ |
| 1151 | elevator_exit(old_elevator); | 1151 | elevator_exit(old_elevator); |
| 1152 | spin_lock_irq(q->queue_lock); | 1152 | spin_lock_irq(q->queue_lock); |
| 1153 | elv_quisce_end(q); | 1153 | elv_quiesce_end(q); |
| 1154 | spin_unlock_irq(q->queue_lock); | 1154 | spin_unlock_irq(q->queue_lock); |
| 1155 | 1155 | ||
| 1156 | blk_add_trace_msg(q, "elv switch: %s", e->elevator_type->elevator_name); | 1156 | blk_add_trace_msg(q, "elv switch: %s", e->elevator_type->elevator_name); |
