hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8YC6O
----------------------------------------------------------------------
To add misc-filescontrol, rename filescontrol.c to legacy-filescontrol.c.
Signed-off-by: Chen Ridong chenridong@huawei.com --- fs/Makefile | 2 +- fs/file.c | 2 +- fs/{filescontrol.c => legacy-filescontrol.c} | 2 +- include/linux/{filescontrol.h => legacy-filescontrol.h} | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename fs/{filescontrol.c => legacy-filescontrol.c} (99%) rename include/linux/{filescontrol.h => legacy-filescontrol.h} (93%)
diff --git a/fs/Makefile b/fs/Makefile index db63c24fae57..63a775009093 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_SYSCTL) += drop_caches.o sysctls.o obj-$(CONFIG_DIRTY_PAGES) += dirty_pages.o
obj-$(CONFIG_FHANDLE) += fhandle.o -obj-$(CONFIG_CGROUP_FILES) += filescontrol.o +obj-$(CONFIG_CGROUP_FILES) += legacy-filescontrol.o obj-y += iomap/
obj-y += quota/ diff --git a/fs/file.c b/fs/file.c index 4419f6975c96..00f602c0a6db 100644 --- a/fs/file.c +++ b/fs/file.c @@ -19,7 +19,7 @@ #include <linux/bitops.h> #include <linux/spinlock.h> #include <linux/rcupdate.h> -#include <linux/filescontrol.h> +#include <linux/legacy-filescontrol.h> #include <linux/close_range.h> #include <net/sock.h>
diff --git a/fs/filescontrol.c b/fs/legacy-filescontrol.c similarity index 99% rename from fs/filescontrol.c rename to fs/legacy-filescontrol.c index 18924673b806..a9d643bfcf5f 100644 --- a/fs/filescontrol.c +++ b/fs/legacy-filescontrol.c @@ -16,7 +16,7 @@ */
#include <linux/page_counter.h> -#include <linux/filescontrol.h> +#include <linux/legacy-filescontrol.h> #include <linux/cgroup.h> #include <linux/export.h> #include <linux/printk.h> diff --git a/include/linux/filescontrol.h b/include/linux/legacy-filescontrol.h similarity index 93% rename from include/linux/filescontrol.h rename to include/linux/legacy-filescontrol.h index 0274349bd918..c455812264af 100644 --- a/include/linux/filescontrol.h +++ b/include/linux/legacy-filescontrol.h @@ -15,8 +15,8 @@ * GNU General Public License for more details. */
-#ifndef _LINUX_FILESCONTROL_H -#define _LINUX_FILESCONTROL_H +#ifndef _LINUX_LEGACY_FILESCONTROL_H +#define _LINUX_LEGACY_FILESCONTROL_H
#include <linux/fdtable.h>
@@ -41,4 +41,4 @@ static inline int files_cgroup_dup_fds(struct files_struct *newf) { return 0; }; static inline void files_cgroup_put_fd(struct files_struct *files, unsigned int fd) {}; #endif /* CONFIG_CGROUP_FILES */
-#endif /* _LINUX_FILESCONTROL_H */ +#endif /* _LINUX_LEGACY_FILESCONTROL_H */