[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>

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;