diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-06-09 05:47:10 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-06-09 05:47:10 +0200 |
| commit | dbb66c4be020b01dc2f3d7c609ddb0e09d2c0af7 (patch) | |
| tree | b80ec96749fdc8f26a33496ee4593ddbcc58f6ed | |
| parent | Revert "block: implement blkdev_readpages" (diff) | |
| download | linux-dbb66c4be020b01dc2f3d7c609ddb0e09d2c0af7.tar.xz linux-dbb66c4be020b01dc2f3d7c609ddb0e09d2c0af7.zip | |
block: needs to set the residual length of a bidi request
Tejun's "block: set rq->resid_len to blk_rq_bytes() on issue" patch
seems to be incomplete; It doesn't set rq->resid_len to blk_rq_bytes()
for a bidi request (req->next_rq). As a result, all bidi users are
broken.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | block/blk-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 7ae83a1e2acf..03c5a64b6ccb 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1846,6 +1846,9 @@ void blk_start_request(struct request *req) * resid_len to full count and add the timeout handler. */ req->resid_len = blk_rq_bytes(req); + if (unlikely(blk_bidi_rq(req))) + req->next_rq->resid_len = blk_rq_bytes(req->next_rq); + blk_add_timer(req); } EXPORT_SYMBOL(blk_start_request); |