aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-05-07 22:54:07 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-05-11 03:52:16 -0400
commit10e1e629b386aef97bf66de6ef28d450bec06ee3 (patch)
treecdcdea0f2b56bacd67ef4e98bd48f9b72faf788c /drivers
parentb12d4f82c1a3cdcb2441c803a3368a9426f2f47f (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/ps3disk.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 8d583081b50a..f4d8db944e7d 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -157,7 +157,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
157 if (res) { 157 if (res) {
158 dev_err(&dev->sbd.core, "%s:%u: %s failed %d\n", __func__, 158 dev_err(&dev->sbd.core, "%s:%u: %s failed %d\n", __func__,
159 __LINE__, op, res); 159 __LINE__, op, res);
160 __blk_end_request_cur(req, -EIO); 160 __blk_end_request_all(req, -EIO);
161 return 0; 161 return 0;
162 } 162 }
163 163
@@ -179,7 +179,7 @@ static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
179 if (res) { 179 if (res) {
180 dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n", 180 dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
181 __func__, __LINE__, res); 181 __func__, __LINE__, res);
182 __blk_end_request_cur(req, -EIO); 182 __blk_end_request_all(req, -EIO);
183 return 0; 183 return 0;
184 } 184 }
185 185
@@ -195,6 +195,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
195 dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__); 195 dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__);
196 196
197 while ((req = elv_next_request(q))) { 197 while ((req = elv_next_request(q))) {
198 blkdev_dequeue_request(req);
199
198 if (blk_fs_request(req)) { 200 if (blk_fs_request(req)) {
199 if (ps3disk_submit_request_sg(dev, req)) 201 if (ps3disk_submit_request_sg(dev, req))
200 break; 202 break;
@@ -204,7 +206,7 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
204 break; 206 break;
205 } else { 207 } else {
206 blk_dump_rq_flags(req, DEVICE_NAME " bad request"); 208 blk_dump_rq_flags(req, DEVICE_NAME " bad request");
207 __blk_end_request_cur(req, -EIO); 209 __blk_end_request_all(req, -EIO);
208 continue; 210 continue;
209 } 211 }
210 } 212 }