block: drop barrier ordering by queue draining

[people/arne_f/kernel.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 874eb4ea80935f9c05be41bbfe9cd77c8808faa4..08081e4b294eaf4aa34c763718b22244e9c22c35 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -62,7 +62,7 @@ static inline struct request *__elv_next_request(struct request_queue *q)
                        rq = list_entry_rq(q->queue_head.next);
                        rq = blk_do_ordered(q, rq);
                        if (rq)
-                               return !IS_ERR(rq) ? rq : NULL;
+                               return rq;
                }
 
                if (!q->elevator->ops->elevator_dispatch_fn(q, 0))