Skip to content

Commit

Permalink
[PATCH] cpqarray: fix iostat
Browse files Browse the repository at this point in the history
cpqarray needs to call disk_stat_add() for iostat to work.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jens Axboe authored and Linus Torvalds committed Nov 14, 2006
1 parent b369c2c commit 1f794b6
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions 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 1f794b6

Please sign in to comment.