diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-05-20 20:52:16 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-05-20 20:52:16 +0200 |
| commit | 771949d03b4f5295f648f09141325fd478f6c7ce (patch) | |
| tree | 5e69b743566cc8f1eaafffcd03554bbd2b84e028 /block/elevator.c | |
| parent | Merge branch 'for-linus' into for-2.6.40/core (diff) | |
| download | linux-771949d03b4f5295f648f09141325fd478f6c7ce.tar.xz linux-771949d03b4f5295f648f09141325fd478f6c7ce.zip | |
block: get rid of on-stack plugging debug checks
We don't need them anymore, so kill:
- REQ_ON_PLUG checks in various places
- !rq_mergeable() check in plug merging
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/block/elevator.c b/block/elevator.c index 2a0b653c90fd..b0b38ce0dcb6 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -416,8 +416,6 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq) struct list_head *entry; int stop_flags; - BUG_ON(rq->cmd_flags & REQ_ON_PLUG); - if (q->last_merge == rq) q->last_merge = NULL; @@ -656,8 +654,6 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where) rq->q = q; - BUG_ON(rq->cmd_flags & REQ_ON_PLUG); - if (rq->cmd_flags & REQ_SOFTBARRIER) { /* barriers are scheduling boundary, update end_sector */ if (rq->cmd_type == REQ_TYPE_FS || |