Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13f98250 authored by Vivek Goyal's avatar Vivek Goyal Committed by Jens Axboe
Browse files

blkio: Do not export throttle files if CONFIG_BLK_DEV_THROTTLING=n 



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: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent efb012b3

block/blk-cgroup.c

+50 −47
Original line number Diff line number Diff line
@@ -1241,41 +1241,6 @@ struct cftype blkio_files[] = { 
		.read_u64 = blkiocg_file_read_u64,

		.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,
@@ -1294,24 +1259,12 @@ struct cftype blkio_files[] = { 
				BLKIO_PROP_io_service_bytes),

		.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,
@@ -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",