autofs: update fs/autofs4/Kconfig

Update Kconfig and add a depricated warning.

[raven@themaw.net: make autofs4 Kconfig depend on AUTOFS_FS]
  Link: http://lkml.kernel.org/r/152687649097.8263.7046086367407522029.stgit@pluto.themaw.net
Link: http://lkml.kernel.org/r/152626706133.28589.11994171621899212952.stgit@pluto.themaw.net
Signed-off-by: Ian Kent <raven@themaw.net>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 22 insertions, 10 deletions

diff --git a/fs/autofs4/Kconfig b/fs/autofs4/Kconfig
index 44727bf18297..53bc592a250d 100644
--- a/fs/autofs4/Kconfig
+++ b/fs/autofs4/Kconfig
@@ -1,5 +1,6 @@
 config AUTOFS4_FS
-        tristate "Kernel automounter version 4 support (also supports v3)"
+        tristate "Kernel automounter version 4 support (also supports v3 and v5)"
+        default n
         help
           The automounter is a tool to automatically mount remote file systems
           on demand. This implementation is partially kernel-based to reduce
@@ -7,14 +8,25 @@ config AUTOFS4_FS
           automounter (amd), which is a pure user space daemon.
 
           To use the automounter you need the user-space tools from
-          <https://www.kernel.org/pub/linux/daemons/autofs/v4/>; you also
-          want to answer Y to "NFS file system support", below.
+          <https://www.kernel.org/pub/linux/daemons/autofs/>; you also want
+          to answer Y to "NFS file system support", below.
 
-          To compile this support as a module, choose M here: the module will be
-          called autofs4.  You will need to add "alias autofs autofs4" to your
-          modules configuration file.
+          This module is in the process of being renamed from autofs4 to
+          autofs. Since autofs is now the only module that provides the
+          autofs file system the module is not version 4 specific.
 
-          If you are not a part of a fairly large, distributed network or
-          don't have a laptop which needs to dynamically reconfigure to the
-          local network, you probably do not need an automounter, and can say
-          N here.
+          The autofs4 module is now built from the source located in
+          fs/autofs. The autofs4 directory and its configuration entry
+          will be removed two kernel versions from the inclusion of this
+          change.
+
+          Changes that will need to be made should be limited to:
+          - source include statments should be changed from autofs_fs4.h to
+            autofs_fs.h since these two header files have been merged.
+          - user space scripts that manually load autofs4.ko should be
+            changed to load autofs.ko. But since the module directory name
+            and the module name are the same as the file system name there
+            is no need to manually load module.
+          - any "alias autofs autofs4" will need to be removed.
+
+          Please configure AUTOFS_FS instead of AUTOFS4_FS from now on.