ps3disk: dequeue in-flight request
Other than in issue error paths, ps3disk always completely finishes fetched requests. With full completion on error paths, it can be easily converted to dequeueing model. * After L1 r/w call failure, ps3disk_submit_request_sg() now fails the whole request. Issue failure isn't likely to benefit from partial retry anyway and ps3disk uses full failure in completion error path too, so I don't think this amounts to any meaningful functionality loss. * flush completion is converted to _all for consistency. It doesn't make any functional difference. [ Impact: dequeue in-flight request ] Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
parent
b12d4f82c1
commit
10e1e629b3
|
@ -157,7 +157,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
|
||||||
if (res) {
|
if (res) {
|
||||||
dev_err(&dev->sbd.core, "%s:%u: %s failed %d\n", __func__,
|
dev_err(&dev->sbd.core, "%s:%u: %s failed %d\n", __func__,
|
||||||
__LINE__, op, res);
|
__LINE__, op, res);
|
||||||
__blk_end_request_cur(req, -EIO);
|
__blk_end_request_all(req, -EIO);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
|
||||||
if (res) {
|
if (res) {
|
||||||
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
|
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
|
||||||
__func__, __LINE__, res);
|
__func__, __LINE__, res);
|
||||||
__blk_end_request_cur(req, -EIO);
|
__blk_end_request_all(req, -EIO);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -195,6 +195,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
|
||||||
dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__);
|
dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__);
|
||||||
|
|
||||||
while ((req = elv_next_request(q))) {
|
while ((req = elv_next_request(q))) {
|
||||||
|
blkdev_dequeue_request(req);
|
||||||
|
|
||||||
if (blk_fs_request(req)) {
|
if (blk_fs_request(req)) {
|
||||||
if (ps3disk_submit_request_sg(dev, req))
|
if (ps3disk_submit_request_sg(dev, req))
|
||||||
break;
|
break;
|
||||||
|
@ -204,7 +206,7 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
blk_dump_rq_flags(req, DEVICE_NAME " bad request");
|
blk_dump_rq_flags(req, DEVICE_NAME " bad request");
|
||||||
__blk_end_request_cur(req, -EIO);
|
__blk_end_request_all(req, -EIO);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue