1 files changed, 9 insertions, 8 deletions

diff --git a/block/elevator.c b/block/elevator.c
index b9c518afe1f8..952aee04a68a 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -712,6 +712,14 @@ 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)) {
+                        end_queued_request(rq, 1);
+                        continue;
+                }
                 if (!(rq->cmd_flags & REQ_STARTED)) {
                         /*
                          * This is the first time the device driver
@@ -751,15 +759,8 @@ struct request *elv_next_request(struct request_queue *q)
                         rq = NULL;
                         break;
                 } else if (ret == BLKPREP_KILL) {
-                        int nr_bytes = rq->hard_nr_sectors << 9;
-
-                        if (!nr_bytes)
-                                nr_bytes = rq->data_len;
-
-                        blkdev_dequeue_request(rq);
                         rq->cmd_flags |= REQ_QUIET;
-                        end_that_request_chunk(rq, 0, nr_bytes);
-                        end_that_request_last(rq, 0);
+                        end_queued_request(rq, 0);
                 } else {
                         printk(KERN_ERR "%s: bad return=%d\n", __FUNCTION__,
                                                                 ret);