block: simplify empty barrier implementation

[linux-2.6-block.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 261ffaaf47bdbd125e3c91e44a4e9f7b3ed59fc0..ff60177a3bab2d47a918b3027a3b9ba2020d7e78 100644 (file)
--- 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