aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-11-27 23:32:06 -0500
committerJens Axboe <jens.axboe@oracle.com>2008-12-29 02:28:45 -0500
commit58eea927d2de43dc6f03d1ba2c46e55854b31540 (patch)
treebb43f43891a3154741bb6a116dc2956342160f15 /include/linux/blkdev.h
parent8f11b3e99a1136fcbb67316c3260f085299c0bff (diff)
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 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 3c7078e0129d..41bbadfd17f6 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -596,7 +596,6 @@ enum {
596#define blk_fua_rq(rq) ((rq)->cmd_flags & REQ_FUA) 596#define blk_fua_rq(rq) ((rq)->cmd_flags & REQ_FUA)
597#define blk_discard_rq(rq) ((rq)->cmd_flags & REQ_DISCARD) 597#define blk_discard_rq(rq) ((rq)->cmd_flags & REQ_DISCARD)
598#define blk_bidi_rq(rq) ((rq)->next_rq != NULL) 598#define blk_bidi_rq(rq) ((rq)->next_rq != NULL)
599#define blk_empty_barrier(rq) (blk_barrier_rq(rq) && blk_fs_request(rq) && !(rq)->hard_nr_sectors)
600/* rq->queuelist of dequeued request must be list_empty() */ 599/* rq->queuelist of dequeued request must be list_empty() */
601#define blk_queued_rq(rq) (!list_empty(&(rq)->queuelist)) 600#define blk_queued_rq(rq) (!list_empty(&(rq)->queuelist))
602 601