releases/2.6.18.3/cpqarray-fix-iostat.patch

   1 From stable-bounces@linux.kernel.org  Wed Nov 15 01:27:12 2006
   2 From: maks@sternwelten.at
   3 Date: Wed, 15 Nov 2006 00:59:03 GMT
   4 Message-Id: <200611150059.kAF0x3XU009627@hera.kernel.org>
   5 To: stable@kernel.org
   6 Subject: cpqarray: fix iostat
   7
   8 From: Jens Axboe <jens.axboe@oracle.com>
   9
  10 cpqarray needs to call disk_stat_add() for iostat to work.
  11
  12 Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  13 Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  14 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  15 ---
  16
  17  drivers/block/cpqarray.c |   15 +++++++++++----
  18  1 file changed, 11 insertions(+), 4 deletions(-)
  19
  20 --- linux-2.6.18.2.orig/drivers/block/cpqarray.c
  21 +++ linux-2.6.18.2/drivers/block/cpqarray.c
  22 @@ -1000,6 +1000,7 @@ static inline void complete_buffers(stru
  23   */
  24  static inline void complete_command(cmdlist_t *cmd, int timeout)
  25  {
  26 +       struct request *rq = cmd->rq;
  27         int ok=1;
  28         int i, ddir;
  29
  30 @@ -1031,12 +1032,18 @@ static inline void complete_command(cmdl
  31                  pci_unmap_page(hba[cmd->ctlr]->pci_dev, cmd->req.sg[i].addr,
  32                                 cmd->req.sg[i].size, ddir);
  33
  34 -       complete_buffers(cmd->rq->bio, ok);
  35 +       complete_buffers(rq->bio, ok);
  36
  37 -       add_disk_randomness(cmd->rq->rq_disk);
  38 +       if (blk_fs_request(rq)) {
  39 +               const int rw = rq_data_dir(rq);
  40
  41 -        DBGPX(printk("Done with %p\n", cmd->rq););
  42 -       end_that_request_last(cmd->rq, ok ? 1 : -EIO);
  43 +               disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
  44 +       }
  45 +
  46 +       add_disk_randomness(rq->rq_disk);
  47 +
  48 +       DBGPX(printk("Done with %p\n", rq););
  49 +       end_that_request_last(rq, ok ? 1 : -EIO);
  50  }
  51
  52  /*