From a2225d931f75ddd3c39f4d0d195fad99dfd68671 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 11 Jun 2018 08:22:34 -0700 Subject: autofs: remove left-over autofs4 stubs There's no need to retain the fs/autofs4 directory for backward compatibility. Adding an AUTOFS4_FS fragment to the autofs Kconfig and a module alias for autofs4 is sufficient for almost all cases. Not keeping fs/autofs4 remnants will prevent "insmod /autofs4/autofs4.ko" from working but this shouldn't be used in automation scripts rather than modprobe(8). There were some comments about things to look out for with the module rename in the fs/autofs4/Kconfig that is removed by this patch, see the commit patch if you are interested. One potential problem with this change is that when the fs/autofs/Kconfig fragment for AUTOFS4_FS is removed any AUTOFS4_FS entries will be removed from the kernel config, resulting in no autofs file system being built if there is no AUTOFS_FS entry also. This would have also happened if the fs/autofs4 remnants had remained and is most likely to be a problem with automated builds. Please check your build configurations before the removal which will occur after the next couple of kernel releases. Acked-by: Ian Kent [ With edits and commit message from Ian Kent ] Signed-off-by: Linus Torvalds --- fs/autofs4/Makefile | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 fs/autofs4/Makefile (limited to 'fs/autofs4/Makefile') diff --git a/fs/autofs4/Makefile b/fs/autofs4/Makefile deleted file mode 100644 index 417dd726d9ef..000000000000 --- a/fs/autofs4/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for the linux autofs-filesystem routines. -# - -obj-$(CONFIG_AUTOFS4_FS) += autofs4.o - -autofs4-objs := ../autofs/init.o ../autofs/inode.o ../autofs/root.o \ - ../autofs/symlink.o ../autofs/waitq.o ../autofs/expire.o \ - ../autofs/dev-ioctl.o -- cgit v1.2.3-59-g8ed1b