This patch adds descriptions to the memory controller API files to indicate that the usage/limit are in bytes; the names of the control files can then be simplified to usage/limit. Also removes the unnecessary mem_force_empty_read() function Signed-off-by: Paul Menage --- mm/memcontrol.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) Index: cgroupmap-2.6.24-mm1/mm/memcontrol.c =================================================================== --- cgroupmap-2.6.24-mm1.orig/mm/memcontrol.c +++ cgroupmap-2.6.24-mm1/mm/memcontrol.c @@ -950,19 +950,6 @@ static ssize_t mem_force_empty_write(str return ret; } -/* - * Note: This should be removed if cgroup supports write-only file. - */ - -static ssize_t mem_force_empty_read(struct cgroup *cont, - struct cftype *cft, - struct file *file, char __user *userbuf, - size_t nbytes, loff_t *ppos) -{ - return -EINVAL; -} - - static const struct mem_cgroup_stat_desc { const char *msg; u64 unit; @@ -1001,15 +988,17 @@ static int mem_control_stat_show(struct static struct cftype mem_cgroup_files[] = { { - .name = "usage_in_bytes", + .name = "usage", .private = RES_USAGE, .read_uint = mem_cgroup_read, + .desc = "Memory usage in bytes", }, { - .name = "limit_in_bytes", + .name = "limit", .private = RES_LIMIT, .write = mem_cgroup_write, .read_uint = mem_cgroup_read, + .desc = "Memory limit in bytes", }, { .name = "failcnt", @@ -1019,7 +1008,7 @@ static struct cftype mem_cgroup_files[] { .name = "force_empty", .write = mem_force_empty_write, - .read = mem_force_empty_read, + .desc = "Write to this file to forget all memory charges" }, { .name = "stat", -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/