Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 147020
b: refs/heads/master
c: 10e1e62
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Jens Axboe committed May 11, 2009
1 parent c7f3594 commit 847b802
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b12d4f82c1a3cdcb2441c803a3368a9426f2f47f
refs/heads/master: 10e1e629b386aef97bf66de6ef28d450bec06ee3
8 changes: 5 additions & 3 deletions trunk/drivers/block/ps3disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
if (res) {
dev_err(&dev->sbd.core, "%s:%u: %s failed %d\n", __func__,
__LINE__, op, res);
__blk_end_request_cur(req, -EIO);
__blk_end_request_all(req, -EIO);
return 0;
}

Expand All @@ -179,7 +179,7 @@ static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
if (res) {
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
__func__, __LINE__, res);
__blk_end_request_cur(req, -EIO);
__blk_end_request_all(req, -EIO);
return 0;
}

Expand All @@ -195,6 +195,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__);

while ((req = elv_next_request(q))) {
blkdev_dequeue_request(req);

if (blk_fs_request(req)) {
if (ps3disk_submit_request_sg(dev, req))
break;
Expand All @@ -204,7 +206,7 @@ static void ps3disk_do_request(struct ps3_storage_device *dev,
break;
} else {
blk_dump_rq_flags(req, DEVICE_NAME " bad request");
__blk_end_request_cur(req, -EIO);
__blk_end_request_all(req, -EIO);
continue;
}
}
Expand Down

0 comments on commit 847b802

Please sign in to comment.