From patchwork Mon May 14 03:04:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 10396537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B09186054D for ; Mon, 14 May 2018 03:04:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BF582905C for ; Mon, 14 May 2018 03:04:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A6FF28FDD; Mon, 14 May 2018 03:04:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02E9F29074 for ; Mon, 14 May 2018 03:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbeENDEf (ORCPT ); Sun, 13 May 2018 23:04:35 -0400 Received: from icp-osb-irony-out8.external.iinet.net.au ([203.59.1.225]:38052 "EHLO icp-osb-irony-out8.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953AbeENDEc (ORCPT ); Sun, 13 May 2018 23:04:32 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2C4CwBP/Pha/+U/0XZcHgEGDINDYXsog?= =?us-ascii?q?3KUcEUBAQEDBoEHNHyTRoFkHhAIAYRAAoMJITcVAQIBAQEBAQECbBwMhSkGI1Y?= =?us-ascii?q?QGAEMAhgOAgJHEAYTgyWBcgwQqW2CHBoCiCCCIgWBCYccgQyBB4E+hygPgxiCV?= =?us-ascii?q?AKHOIRgYos8CY5RgTaDZYJQhQSHSIpAMiKBUk0uCoJuAQEBDYsQhUsyMHoBAY0?= =?us-ascii?q?bgkYBAQ?= X-IPAS-Result: =?us-ascii?q?A2C4CwBP/Pha/+U/0XZcHgEGDINDYXsog3KUcEUBAQEDBoE?= =?us-ascii?q?HNHyTRoFkHhAIAYRAAoMJITcVAQIBAQEBAQECbBwMhSkGI1YQGAEMAhgOAgJHE?= =?us-ascii?q?AYTgyWBcgwQqW2CHBoCiCCCIgWBCYccgQyBB4E+hygPgxiCVAKHOIRgYos8CY5?= =?us-ascii?q?RgTaDZYJQhQSHSIpAMiKBUk0uCoJuAQEBDYsQhUsyMHoBAY0bgkYBAQ?= X-IronPort-AV: E=Sophos;i="5.49,398,1520870400"; d="scan'208";a="126179598" Received: from unknown (HELO pluto.themaw.net) ([118.209.63.229]) by icp-osb-irony-out8.iinet.net.au with ESMTP; 14 May 2018 11:04:22 +0800 Subject: [PATCH 05/10] autofs - update fs/autofs4/Kconfig From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , autofs mailing list , Kernel Mailing List Date: Mon, 14 May 2018 11:04:21 +0800 Message-ID: <152626706133.28589.11994171621899212952.stgit@pluto.themaw.net> In-Reply-To: <152626703024.28589.9571964661718767929.stgit@pluto.themaw.net> References: <152626703024.28589.9571964661718767929.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Update Kconfig and add a depricated warning. Signed-off-by: Ian Kent --- fs/autofs4/Kconfig | 32 ++++++++++++++++++++++---------- 1 file 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 - ; you also - want to answer Y to "NFS file system support", below. + ; 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.