RE: [Patch 4/8] Enhanced partition statistics: cciss fix

[Miller, Mike (OS Dev)]

>
> Updates the enhanced partition statistics in cciss driver.
>
> Signed-off-by: Jerome Marchand <jmarchan@xxxxxxxxxx>
> ---
>  cciss.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-) diff -urNp -X
> linux-2.6/Documentation/dontdiff
> linux-2.6.orig/drivers/block/cciss.c linux-2.6/drivers/block/cciss.c
> --- linux-2.6.orig/drivers/block/cciss.c        2007-12-04
> 17:37:13.000000000 +0100
> +++ linux-2.6/drivers/block/cciss.c     2007-12-05
> 13:46:29.000000000 +0100
> @@ -1268,7 +1268,8 @@ static void cciss_softirq_done(struct re
>         if (blk_fs_request(rq)) {
>                 const int rw = rq_data_dir(rq);
>
> -               disk_stat_add(rq->rq_disk, sectors[rw],
> rq->nr_sectors);
> +               all_stat_add(rq->rq_disk, sectors[rw],
> +                            rq->nr_sectors, rq->sector);
>         }

How does this mesh with the changes submitted by Kiyoshi Ueda? Any conflicts?

-- mikem
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/