The patch titled CGroup API files: drop mem_cgroup_force_empty() has been removed from the -mm tree. Its filename was cgroup-api-files-drop-mem_cgroup_force_empty.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: CGroup API files: drop mem_cgroup_force_empty() From: Paul Menage <menage@xxxxxxxxxx> 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@xxxxxxxxxx> Cc: "Li Zefan" <lizf@xxxxxxxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxx> Cc: Paul Jackson <pj@xxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: "YAMAMOTO Takashi" <yamamoto@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 12 ------------ 1 file changed, 12 deletions(-) diff -puN mm/memcontrol.c~cgroup-api-files-drop-mem_cgroup_force_empty mm/memcontrol.c --- a/mm/memcontrol.c~cgroup-api-files-drop-mem_cgroup_force_empty +++ a/mm/memcontrol.c @@ -880,17 +880,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; @@ -947,7 +936,6 @@ static struct cftype mem_cgroup_files[] { .name = "force_empty", .write = mem_force_empty_write, - .read = mem_force_empty_read, }, { .name = "stat", _ Patches currently in -mm which might be from menage@xxxxxxxxxx are origin.patch disable-the-memory-controller-by-default-v3.patch add-a-refcount-check-in-dput.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html