cgroup: remove subsystem files when remounting cgroup

[~andy/linux] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index b6e5ca9c758a54cac68805cf1c840ca0b8cd107f..1c317e386831869a3c4ff17a675a06b3b985c06d 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -37,6 +37,7 @@
 #include <linux/notifier.h>
 #include <linux/suspend.h>
 #include <linux/rwsem.h>
+#include <linux/ptrace.h>
 #include <asm/uaccess.h>
 
 #include <trace/events/module.h>
@@ -221,6 +222,8 @@ static int ____call_usermodehelper(void *data)
        retval = kernel_execve(sub_info->path,
                               (const char *const *)sub_info->argv,
                               (const char *const *)sub_info->envp);
+       if (!retval)
+               return 0;
 
        /* Exec failed? */
 fail: