diff options
| author | Tejun Heo <tj@kernel.org> | 2008-11-28 13:32:06 +0900 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-12-29 08:28:45 +0100 |
| commit | 58eea927d2de43dc6f03d1ba2c46e55854b31540 (patch) | |
| tree | bb43f43891a3154741bb6a116dc2956342160f15 /block/elevator.c | |
| parent | 8f11b3e99a1136fcbb67316c3260f085299c0bff (diff) | |
| download | linux-58eea927d2de43dc6f03d1ba2c46e55854b31540.tar.gz linux-58eea927d2de43dc6f03d1ba2c46e55854b31540.tar.bz2 linux-58eea927d2de43dc6f03d1ba2c46e55854b31540.zip | |
block: simplify empty barrier implementation
Empty barrier required special handling in __elv_next_request() to
complete it without letting the low level driver see it.
With previous changes, barrier code is now flexible enough to skip the
BAR step using the same barrier sequence selection mechanism. Drop
the special handling and mask off q->ordered from start_ordered().
Remove blk_empty_barrier() test which now has no user.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/block/elevator.c b/block/elevator.c index 261ffaaf47bd..ff60177a3bab 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -755,14 +755,6 @@ struct request *elv_next_request(struct request_queue *q) int ret; while ((rq = __elv_next_request(q)) != NULL) { - /* - * Kill the empty barrier place holder, the driver must - * not ever see it. - */ - if (blk_empty_barrier(rq)) { - __blk_end_request(rq, 0, blk_rq_bytes(rq)); - continue; - } if (!(rq->cmd_flags & REQ_STARTED)) { /* * This is the first time the device driver |