aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Menage <menage@google.com>2008-04-29 04:00:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:08 -0400
commitc27e8818a09bbdfe7c07c629cb2c27e1a742e156 (patch)
tree2ed583bc69f4224259c00aad8703a0bc452b8469
parentc64745cf0f34f2cb08fc28c93d844e583d0d591d (diff)
CGroup API files: drop mem_cgroup_force_empty()
This function isn't needed - a NULL pointer in the cftype read function will result in the same EINVAL response to userspace. Signed-off-by: Paul Menage <menage@google.com> Cc: "Li Zefan" <lizf@cn.fujitsu.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Paul Jackson <pj@sgi.com> Cc: Pavel Emelyanov <xemul@openvz.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: "YAMAMOTO Takashi" <yamamoto@valinux.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 496ab700e0a4..d12795cc7622 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -880,17 +880,6 @@ static ssize_t mem_force_empty_write(struct cgroup *cont,
880 return ret; 880 return ret;
881} 881}
882 882
883/*
884 * Note: This should be removed if cgroup supports write-only file.
885 */
886static ssize_t mem_force_empty_read(struct cgroup *cont,
887 struct cftype *cft,
888 struct file *file, char __user *userbuf,
889 size_t nbytes, loff_t *ppos)
890{
891 return -EINVAL;
892}
893
894static const struct mem_cgroup_stat_desc { 883static const struct mem_cgroup_stat_desc {
895 const char *msg; 884 const char *msg;
896 u64 unit; 885 u64 unit;
@@ -947,7 +936,6 @@ static struct cftype mem_cgroup_files[] = {
947 { 936 {
948 .name = "force_empty", 937 .name = "force_empty",
949 .write = mem_force_empty_write, 938 .write = mem_force_empty_write,
950 .read = mem_force_empty_read,
951 }, 939 },
952 { 940 {
953 .name = "stat", 941 .name = "stat",