From patchwork Mon May 21 04:21:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 10413823 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 24E6B6053B for ; Mon, 21 May 2018 04:23:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13F2027F8F for ; Mon, 21 May 2018 04:23:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05C1527FA9; Mon, 21 May 2018 04:23:20 +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 774BB27F8F for ; Mon, 21 May 2018 04:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750837AbeEUEXR (ORCPT ); Mon, 21 May 2018 00:23:17 -0400 Received: from icp-osb-irony-out3.external.iinet.net.au ([203.59.1.153]:13538 "EHLO icp-osb-irony-out3.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750704AbeEUEXR (ORCPT ); Mon, 21 May 2018 00:23:17 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DYDgApSQJb/+U/0XZbHgEGDINDgV4og?= =?us-ascii?q?3WUfEsGgQc0fJNKgWQeGAGEQIITITcVAQIBAQEBAQECbCiFUlYoAQwCGA4CSRY?= =?us-ascii?q?ThRYMpX6CHBoCiCKCD4EJhyyBDIEHgQ8vhxwcgxiCVAKFQIZgY4QHh0IJiySDM?= =?us-ascii?q?4E3g22CUH6ECgErkXEyIoFSTS4Kgn6QWzIwegEBjzcBAQ?= X-IPAS-Result: =?us-ascii?q?A2DYDgApSQJb/+U/0XZbHgEGDINDgV4og3WUfEsGgQc0fJN?= =?us-ascii?q?KgWQeGAGEQIITITcVAQIBAQEBAQECbCiFUlYoAQwCGA4CSRYThRYMpX6CHBoCi?= =?us-ascii?q?CKCD4EJhyyBDIEHgQ8vhxwcgxiCVAKFQIZgY4QHh0IJiySDM4E3g22CUH6ECgE?= =?us-ascii?q?rkXEyIoFSTS4Kgn6QWzIwegEBjzcBAQ?= X-IronPort-AV: E=Sophos;i="5.49,425,1520870400"; d="scan'208";a="81069066" Received: from unknown (HELO pluto.themaw.net) ([118.209.63.229]) by icp-osb-irony-out3.iinet.net.au with ESMTP; 21 May 2018 12:21:31 +0800 Subject: [REPOST PATCH] autofs - make autofs4 Kconfig depend on AUTOFS_FS From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , autofs mailing list , Randy Dunlap , Kernel Mailing List Date: Mon, 21 May 2018 12:21:30 +0800 Message-ID: <152687649097.8263.7046086367407522029.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 Setting AUTOFS_FS and AUTOFS4_FS to y or m results in a compile failure. It isn't possible to unset one if the other is set because it introduces a circular dependency. But adding "depends on AUTOFS_FS = n" will make autofs4 appear under the autofs entry which should call attention to it. It also results in AUTOFS4_FS being removed from .config for any setting of AUTOFS_FS except n. Adding a "NOTE" to the AUTOFS4_FS help text will hopefully raise awareness of the change to smooth the transition. Signed-off-by: Ian Kent Reported-by: Randy Dunlap Tested-by: Randy Dunlap --- fs/autofs4/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/autofs4/Kconfig b/fs/autofs4/Kconfig index 53bc592a250d..2c2fdf989f90 100644 --- a/fs/autofs4/Kconfig +++ b/fs/autofs4/Kconfig @@ -1,6 +1,7 @@ config AUTOFS4_FS tristate "Kernel automounter version 4 support (also supports v3 and v5)" default n + depends on AUTOFS_FS = n help The automounter is a tool to automatically mount remote file systems on demand. This implementation is partially kernel-based to reduce @@ -30,3 +31,10 @@ config AUTOFS4_FS - any "alias autofs autofs4" will need to be removed. Please configure AUTOFS_FS instead of AUTOFS4_FS from now on. + + NOTE: Since the modules autofs and autofs4 use the same file system + type name of "autofs" only one can be built. The "depends" + above will result in AUTOFS4_FS not appearing in .config for + any setting of AUTOFS_FS other than n and AUTOFS4_FS will + appear under the AUTOFS_FS entry otherwise which is intended + to draw attention to the module rename change.