diff options
| author | Jens Axboe <axboe@kernel.dk> | 2006-09-30 22:29:12 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2006-09-30 22:29:12 +0400 |
| commit | c00895ab2f08df7044e58ee01c38bf0a661ea0eb (patch) | |
| tree | 95dee4eb76042087c4b8d43a5841b6bae85b8cf3 /block/elevator.c | |
| parent | 8a8e674cb1dafc818ffea93d97e4c1c1f01fdbb6 (diff) | |
| download | linux-c00895ab2f08df7044e58ee01c38bf0a661ea0eb.tar.xz | |
[PATCH] Remove ->waiting member from struct request
As the comments indicates in blkdev.h, we can fold it into ->end_io_data
usage as that is really what ->waiting is. Fixup the users of
blk_end_sync_rq().
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index cbbc36ba016a..924b81b08f86 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -67,8 +67,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio) /* * same device and no special stuff set, merge is ok */ - if (rq->rq_disk == bio->bi_bdev->bd_disk && - !rq->waiting && !rq->special) + if (rq->rq_disk == bio->bi_bdev->bd_disk && !rq->special) return 1; return 0; |