diff --git a/fs/file.c b/fs/file.c
index 6b9ad66d6c32270748d3862472eb19d66242eb3c..5b191c3a3acfbedbdbe9331c57fdd03334380da4 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -423,6 +423,9 @@ static struct fdtable *close_files(struct files_struct * files)
 			set >>= 1;
 		}
 	}
+#ifdef CONFIG_CGROUP_FILES
+	files_cgroup_remove(files);
+#endif
 
 	return fdt;
 }