From 8147eed372ab197712958f10d5f01b21651a4b37 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 26 Aug 2008 13:34:34 +0200 Subject: [PATCH] --- yaml --- r: 110500 b: refs/heads/master c: 605401618ce4409045bc4db86e88d4b38f2ad585 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c32e7861fb30..9abae0b15146 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab780f1ece0dc8d5e8e8e85435acc5e4747ccda3 +refs/heads/master: 605401618ce4409045bc4db86e88d4b38f2ad585 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index b9a252cae4df..5bf806adc770 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -1817,7 +1817,7 @@ static int blk_end_io(struct request *rq, int error, unsigned int nr_bytes, struct request_queue *q = rq->q; unsigned long flags = 0UL; - if (bio_has_data(rq->bio) || blk_discard_rq(rq)) { + if (rq->bio) { if (__end_that_request_first(rq, error, nr_bytes)) return 1; @@ -1875,8 +1875,7 @@ EXPORT_SYMBOL_GPL(blk_end_request); **/ int __blk_end_request(struct request *rq, int error, unsigned int nr_bytes) { - if ((bio_has_data(rq->bio) || blk_discard_rq(rq)) && - __end_that_request_first(rq, error, nr_bytes)) + if (rq->bio && __end_that_request_first(rq, error, nr_bytes)) return 1; add_disk_randomness(rq->rq_disk);