lkml.org 
[lkml]   [2010]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] blkio: Do not export throttle files if CONFIG_BLK_DEV_THROTTLING=n
    Date
    Currently throttling related files were visible even if user had disabled
    throttling using config options. It was switching off background throttling
    of bio but not the cgroup files. This patch fixes it.

    Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
    ---
    block/blk-cgroup.c | 97 +++++++++++++++++++++++++++-------------------------
    1 files changed, 50 insertions(+), 47 deletions(-)

    diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
    index 31a0d4d..1916bc0 100644
    --- a/block/blk-cgroup.c
    +++ b/block/blk-cgroup.c
    @@ -1242,41 +1242,6 @@ struct cftype blkio_files[] = {
    .write_u64 = blkiocg_file_write_u64,
    },
    {
    - .name = "throttle.read_bps_device",
    - .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    - BLKIO_THROTL_read_bps_device),
    - .read_seq_string = blkiocg_file_read,
    - .write_string = blkiocg_file_write,
    - .max_write_len = 256,
    - },
    -
    - {
    - .name = "throttle.write_bps_device",
    - .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    - BLKIO_THROTL_write_bps_device),
    - .read_seq_string = blkiocg_file_read,
    - .write_string = blkiocg_file_write,
    - .max_write_len = 256,
    - },
    -
    - {
    - .name = "throttle.read_iops_device",
    - .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    - BLKIO_THROTL_read_iops_device),
    - .read_seq_string = blkiocg_file_read,
    - .write_string = blkiocg_file_write,
    - .max_write_len = 256,
    - },
    -
    - {
    - .name = "throttle.write_iops_device",
    - .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    - BLKIO_THROTL_write_iops_device),
    - .read_seq_string = blkiocg_file_read,
    - .write_string = blkiocg_file_write,
    - .max_write_len = 256,
    - },
    - {
    .name = "time",
    .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP,
    BLKIO_PROP_time),
    @@ -1295,24 +1260,12 @@ struct cftype blkio_files[] = {
    .read_map = blkiocg_file_read_map,
    },
    {
    - .name = "throttle.io_service_bytes",
    - .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    - BLKIO_THROTL_io_service_bytes),
    - .read_map = blkiocg_file_read_map,
    - },
    - {
    .name = "io_serviced",
    .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP,
    BLKIO_PROP_io_serviced),
    .read_map = blkiocg_file_read_map,
    },
    {
    - .name = "throttle.io_serviced",
    - .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    - BLKIO_THROTL_io_serviced),
    - .read_map = blkiocg_file_read_map,
    - },
    - {
    .name = "io_service_time",
    .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP,
    BLKIO_PROP_io_service_time),
    @@ -1340,6 +1293,56 @@ struct cftype blkio_files[] = {
    .name = "reset_stats",
    .write_u64 = blkiocg_reset_stats,
    },
    +#ifdef CONFIG_BLK_DEV_THROTTLING
    + {
    + .name = "throttle.read_bps_device",
    + .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    + BLKIO_THROTL_read_bps_device),
    + .read_seq_string = blkiocg_file_read,
    + .write_string = blkiocg_file_write,
    + .max_write_len = 256,
    + },
    +
    + {
    + .name = "throttle.write_bps_device",
    + .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    + BLKIO_THROTL_write_bps_device),
    + .read_seq_string = blkiocg_file_read,
    + .write_string = blkiocg_file_write,
    + .max_write_len = 256,
    + },
    +
    + {
    + .name = "throttle.read_iops_device",
    + .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    + BLKIO_THROTL_read_iops_device),
    + .read_seq_string = blkiocg_file_read,
    + .write_string = blkiocg_file_write,
    + .max_write_len = 256,
    + },
    +
    + {
    + .name = "throttle.write_iops_device",
    + .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    + BLKIO_THROTL_write_iops_device),
    + .read_seq_string = blkiocg_file_read,
    + .write_string = blkiocg_file_write,
    + .max_write_len = 256,
    + },
    + {
    + .name = "throttle.io_service_bytes",
    + .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    + BLKIO_THROTL_io_service_bytes),
    + .read_map = blkiocg_file_read_map,
    + },
    + {
    + .name = "throttle.io_serviced",
    + .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_THROTL,
    + BLKIO_THROTL_io_serviced),
    + .read_map = blkiocg_file_read_map,
    + },
    +#endif /* CONFIG_BLK_DEV_THROTTLING */
    +
    #ifdef CONFIG_DEBUG_BLK_CGROUP
    {
    .name = "avg_queue_size",
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-09-28 19:13    [W:0.045 / U:30.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site