Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40912
b: refs/heads/master
c: 1f794b6
h: refs/heads/master
v: v3
  • Loading branch information
Jens Axboe authored and Linus Torvalds committed Nov 14, 2006
1 parent d1f5127 commit bff5c1e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 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: b369c2cfa47bc0ad495a95fe9a17c9888781d615
refs/heads/master: 1f794b6082a5ff88f7c48d1634056026acf806f4
15 changes: 11 additions & 4 deletions trunk/drivers/block/cpqarray.c
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,7 @@ static inline void complete_buffers(struct bio *bio, int ok)
*/
static inline void complete_command(cmdlist_t *cmd, int timeout)
{
struct request *rq = cmd->rq;
int ok=1;
int i, ddir;

Expand Down Expand Up @@ -1029,12 +1030,18 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)
pci_unmap_page(hba[cmd->ctlr]->pci_dev, cmd->req.sg[i].addr,
cmd->req.sg[i].size, ddir);

complete_buffers(cmd->rq->bio, ok);
complete_buffers(rq->bio, ok);

add_disk_randomness(cmd->rq->rq_disk);
if (blk_fs_request(rq)) {
const int rw = rq_data_dir(rq);

DBGPX(printk("Done with %p\n", cmd->rq););
end_that_request_last(cmd->rq, ok ? 1 : -EIO);
disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
}

add_disk_randomness(rq->rq_disk);

DBGPX(printk("Done with %p\n", rq););
end_that_request_last(rq, ok ? 1 : -EIO);
}

/*
Expand Down

0 comments on commit bff5c1e

Please sign in to comment.