lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xd: dequeue in-flight request

Browse Source 
xd processes requests one-by-one synchronously and can be easily
converted to dequeueing model.  Convert it.

While at it, use rq_cur_bytes instead of rq_bytes when checking for
sector overflow.  This is for for consistency and better behavior for
merged requests.

[ Impact: dequeue in-flight request ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Tejun Heo
2009-05-08 11:54:10 +09:00
committed by Jens Axboe
parent 06b0608e2b
commit bab2a807a4
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/block/xd.c
View File

@@ -305,26 +305,31 @@ static void do_xd_request (struct request_queue * q)
if (xdc_busy) if (xdc_busy)
return; return;
while ((req = elv_next_request(q)) != NULL) { req = elv_next_request(q);
if (req)
blkdev_dequeue_request(req);
while (req) {
unsigned block = blk_rq_pos(req); unsigned block = blk_rq_pos(req);
unsigned count = blk_rq_sectors(req); unsigned count = blk_rq_cur_sectors(req);
XD_INFO *disk = req->rq_disk->private_data; XD_INFO *disk = req->rq_disk->private_data;
int res = 0; int res = -EIO;
int retry; int retry;
if (!blk_fs_request(req)) { if (!blk_fs_request(req))
__blk_end_request_cur(req, -EIO); goto done;
continue; if (block + count > get_capacity(req->rq_disk))
} goto done;
if (block + count > get_capacity(req->rq_disk)) {
__blk_end_request_cur(req, -EIO);
continue;
}
for (retry = 0; (retry < XD_RETRIES) && !res; retry++) for (retry = 0; (retry < XD_RETRIES) && !res; retry++)
res = xd_readwrite(rq_data_dir(req), disk, req->buffer, res = xd_readwrite(rq_data_dir(req), disk, req->buffer,
block, count); block, count);
done:
/* wrap up, 0 = success, -errno = fail */ /* wrap up, 0 = success, -errno = fail */
__blk_end_request_cur(req, res); if (!__blk_end_request_cur(req, res)) {
req = elv_next_request(q);
if (req)
blkdev_dequeue_request(req);
}
} }
} }