[PATCH 11/25] io-controller: Export disk time used and nr sectors dipatched through cgroups

[Vivek Goyal]

On Wed, Jul 08, 2009 at 10:16:44AM +0800, Gui Jianfeng wrote:
[..]
> 
> Hi Vivek,
> 
> Let io.disk_*'s outputs conform with io.policy's.
> 

Sure. Queued up for next posting.

Thanks
Vivek

> Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
> ---
>  block/elevator-fq.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/block/elevator-fq.c b/block/elevator-fq.c
> index 7c83d1e..29392e7 100644
> --- a/block/elevator-fq.c
> +++ b/block/elevator-fq.c
> @@ -1631,7 +1631,7 @@ static int io_cgroup_disk_time_read(struct cgroup *cgroup,
>  		 * waiting to be reclaimed upon cgoup deletion.
>  		 */
>  		if (iog->key) {
> -			seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev),
> +			seq_printf(m, "%u:%u %lu\n", MAJOR(iog->dev),
>  					MINOR(iog->dev),
>  					iog->entity.total_service);
>  		}
> @@ -1661,7 +1661,7 @@ static int io_cgroup_disk_sectors_read(struct cgroup *cgroup,
>  		 * waiting to be reclaimed upon cgoup deletion.
>  		 */
>  		if (iog->key) {
> -			seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev),
> +			seq_printf(m, "%u:%u %lu\n", MAJOR(iog->dev),
>  					MINOR(iog->dev),
>  					iog->entity.total_sector_service);
>  		}
> @@ -1692,7 +1692,7 @@ static int io_cgroup_disk_queue_read(struct cgroup *cgroup,
>  		 * waiting to be reclaimed upon cgoup deletion.
>  		 */
>  		if (iog->key) {
> -			seq_printf(m, "%u %u %lu %lu\n", MAJOR(iog->dev),
> +			seq_printf(m, "%u:%u %lu %lu\n", MAJOR(iog->dev),
>  					MINOR(iog->dev), iog->queue,
>  					iog->queue_duration);
>  		}
> @@ -1722,7 +1722,7 @@ static int io_cgroup_disk_dequeue_read(struct cgroup *cgroup,
>  		 * waiting to be reclaimed upon cgoup deletion.
>  		 */
>  		if (iog->key) {
> -			seq_printf(m, "%u %u %lu\n", MAJOR(iog->dev),
> +			seq_printf(m, "%u:%u %lu\n", MAJOR(iog->dev),
>  					MINOR(iog->dev), iog->dequeue);
>  		}
>  	}
> -- 
> 1.5.4.rc3
>