diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3469cf42e15be154efb7a3daf890a0380baa7dfc..b0b9265fe5f382cdea034e5394efd5ed3ad83901 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -500,9 +500,10 @@
 			  a single hierarchy
 			- foo isn't visible as an individually mountable
 			  subsystem
-			{Currently only "memory" controller deal with this and
-			cut the overhead, others just disable the usage. So
-			only cgroup_disable=memory is actually worthy}
+			{Currently "memory" and "files" controller deal with
+			this and cut the overhead, others just disable the usage.
+			So cgroup_disable=memory and cgroup_disable=files are
+			actually worthy}
 
 	cgroup_no_v1=	[KNL] Disable cgroup controllers and named hierarchies in v1
 			Format: { { controller | "all" | "named" }
diff --git a/fs/file.c b/fs/file.c
index df17b9e9e67e81781def00c51f4e51280c34da2b..59f8d3d825091e9f180a9c05967052dc5e2e1eac 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -308,7 +308,8 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
 	new_fdt->full_fds_bits = newf->full_fds_bits_init;
 	new_fdt->fd = &newf->fd_array[0];
 #ifdef CONFIG_CGROUP_FILES
-	files_cgroup_assign(newf);
+	if (files_cgroup_enabled())
+		files_cgroup_assign(newf);
 #endif
 
 	spin_lock(&oldf->file_lock);
@@ -374,6 +375,8 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
 
 	rcu_assign_pointer(newf->fdt, new_fdt);
 #ifdef CONFIG_CGROUP_FILES
+	if (!files_cgroup_enabled())
+		return newf;
 	spin_lock(&newf->file_lock);
 	if (!files_cgroup_alloc_fd(newf, files_cgroup_count_fds(newf))) {
 		spin_unlock(&newf->file_lock);
@@ -398,7 +401,8 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
 
 out_release:
 #ifdef CONFIG_CGROUP_FILES
-	files_cgroup_remove(newf);
+	if (files_cgroup_enabled())
+		files_cgroup_remove(newf);
 #endif
 	kmem_cache_free(files_cachep, newf);
 out:
@@ -426,7 +430,8 @@ static struct fdtable *close_files(struct files_struct * files)
 				struct file * file = xchg(&fdt->fd[i], NULL);
 				if (file) {
 #ifdef CONFIG_CGROUP_FILES
-					files_cgroup_unalloc_fd(files, 1);
+					if (files_cgroup_enabled())
+						files_cgroup_unalloc_fd(files, 1);
 #endif
 					filp_close(file, files);
 					cond_resched();
@@ -437,7 +442,8 @@ static struct fdtable *close_files(struct files_struct * files)
 		}
 	}
 #ifdef CONFIG_CGROUP_FILES
-	files_cgroup_remove(files);
+	if (files_cgroup_enabled())
+		files_cgroup_remove(files);
 #endif
 
 	return fdt;
@@ -559,7 +565,7 @@ int __alloc_fd(struct files_struct *files,
 	if (error)
 		goto repeat;
 #ifdef CONFIG_CGROUP_FILES
-	if (files_cgroup_alloc_fd(files, 1)) {
+	if (files_cgroup_enabled() && files_cgroup_alloc_fd(files, 1)) {
 		error = -EMFILE;
 		goto out;
 	}
@@ -607,7 +613,7 @@ static void __put_unused_fd(struct files_struct *files, unsigned int fd)
 {
 	struct fdtable *fdt = files_fdtable(files);
 #ifdef CONFIG_CGROUP_FILES
-	if (test_bit(fd, fdt->open_fds))
+	if (files_cgroup_enabled() && test_bit(fd, fdt->open_fds))
 		files_cgroup_unalloc_fd(files, 1);
 #endif
 	__clear_open_fd(fd, fdt);
@@ -1041,7 +1047,8 @@ __releases(&files->file_lock)
 		goto out;
 	}
 #ifdef CONFIG_CGROUP_FILES
-	if (!tofree && files_cgroup_alloc_fd(files, 1)) {
+	if (files_cgroup_enabled() &&
+	    !tofree && files_cgroup_alloc_fd(files, 1)) {
 		err = -EMFILE;
 		goto out;
 	}
diff --git a/include/linux/filescontrol.h b/include/linux/filescontrol.h
index 49dc620cf64ec7fca7385cf8b544b4c6062c79f1..0182f145a339269bd29eafe40e0e4e7722c92ea9 100644
--- a/include/linux/filescontrol.h
+++ b/include/linux/filescontrol.h
@@ -19,6 +19,7 @@
 #define _LINUX_FILESCONTROL_H
 
 #include <linux/fdtable.h>
+#include <linux/cgroup.h>
 
 #ifdef CONFIG_CGROUP_FILES
 
@@ -30,5 +31,10 @@ extern struct files_struct init_files;
 void files_cgroup_assign(struct files_struct *files);
 void files_cgroup_remove(struct files_struct *files);
 
+static inline bool files_cgroup_enabled(void)
+{
+	return cgroup_subsys_enabled(files_cgrp_subsys);
+}
+
 #endif /* CONFIG_CGROUP_FILES */
 #endif /* _LINUX_FILESCONTROL_H */