From patchwork Tue May 29 09:46:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 137131 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3830796lji; Tue, 29 May 2018 02:47:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr+CH4EsHUZCmcRnVQblLpqe5ey/29kabjGnvRrKx1j9BqyjDYa7083c4eKRS4hVOhVzFXG X-Received: by 2002:a62:8dc9:: with SMTP id p70-v6mr16651030pfk.72.1527587273363; Tue, 29 May 2018 02:47:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527587273; cv=none; d=google.com; s=arc-20160816; b=w3LU4YwIR8OwFFX0bLwCx1j8+ZeMs/w3XmyHQ32rlyVS0AecUbqTD+TFQwBQ5q6EnO Cx79myaz7LVq0JHHfCtrBQAY7WUzlquQg/9ojV6NL9MfWF5mthjJlayX+h+UdDd/d8cC Y6UCoIdo3hc9mKVsk4nMGYEinMDfcH2YQltN1MAiT+896fXyjupiGobGqdRREP/s/uFV BBQzx5Q39zhH6oFNW9mGQRjve0wUdlEnaNukDhpQ+/fVKuK3cNu5+rRw/v4gjX7P/GeP rGfFKyvxVuPfDJ/dS+GrU0KeYI6yy2Q65SVRqQUfWiBodcrjeU0dy+dFiepWQ5VTrJGW IkhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=CZ/GEDwO4wcCfTbitdTrMf7CgGou+Hh+JjCF77tH4ew=; b=05efXgsXrLDRqmvOgFOvpXdjnSBEhBxIjw49y5op3i/uywoteTJVDszbOCFpwXZ9Om fRF5b7X9UwpCfO+s2fSh3vd8TvsW4brD1BW5XedEWjE/hYWG6koQeZS1dY6DBccXU7vK i2JuTqyyY63HqFjUQZ9so07VI7ONWwjWYJjA1aEba8SmP3/9VxrWG4JP9Xx4drKgCpOk qzc1+qA7U7YleN5ISdoQ/FbImGRkxWGx+oV+d8z+Qcga6Hx1FOzWdqClFRz6samAmdwd 5l7xXDM85B1id2r+wX/Kvk1g/Xt1WqYfCCeU5bJIFR8MCKqgCFVsyq7iG89hdprSEuxK nsoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w9-v6si33433643plk.28.2018.05.29.02.47.53; Tue, 29 May 2018 02:47:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932653AbeE2Jru (ORCPT + 30 others); Tue, 29 May 2018 05:47:50 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:39021 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932455AbeE2JrM (ORCPT ); Tue, 29 May 2018 05:47:12 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MVHuk-1fpiMA0YOc-00YlJW; Tue, 29 May 2018 11:47:04 +0200 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , Ian Kent , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH] autofs: make autofs4 and autofs mutually exclusive Date: Tue, 29 May 2018 11:46:46 +0200 Message-Id: <20180529094702.4092022-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:8zubNtgJPbkXhppajW2G370/zfQ9oZTkPMkWbjoMT85xL4baU0F VFitAGm0/1lNsZfHTjISi0s7AUZ2GGr9+ZEXXvmGJZYAx9XesoVmf61VprU8+bOmpA4kSrd qffusj0VC3R0r4jWPiuIM+P04hWPhUUr07bJnCV4YomCUuSBSdXQA1WZ3PEV5JLR3eLBVUA d1hqHFjAA0TiOR9NwAioA== X-UI-Out-Filterresults: notjunk:1; V01:K0:NF5vkWHDBvQ=:9zDNOTHffp7QupHbmu56PM xp2TYwVz3BiARoT9GPGToOJ01dhbXrzPbzM8B2guVgraGYfi7AZHpA+0fo+SCpjyrPYMOsaEw TwaD5CaaWoJ4yzD2ZuPDksp/1muykGGKhN0+zAefRcU+SS7wRjqnxrze0UmxSnbpMr8GRK7mo ULMG4FPI/d/uua1PNfIgRl/XV3+VLjJ4y/M0uAWtXp4+g5TF5KwubxH3e6LvB3DVyD6+D0qir AeM9c2hlnLHGbWcm17a2NnznwycAhWDas5BYSoVllx5FHA2XX6QqGQf8zfOVO1F2TP7tr33Yi /seRCXMmy6PjQelIZmiRwiiKTRnVVEeOipFjcPGMRrZ0ZEBjuocBNv7F8a4ShAdAV4EZngxix HMo5kCG7G2gB0ljM6BrjsukDnVssCEAfd1cqjkyS8oesHJ8XD9URmmognHhmHkDjv1moL2m23 5faa/CoRavl0F1vrnOWsvST/aL+MPc9Z0m5C3aq7RwzHUfg9/MrPOo+0KT2wRel2IfXl0++3f 2FIlgTb6UoyUoHTBynol9ohI0yAC92pUr/GOv5f9jETrvfZmXcg8GOgBjcBAFGuQkrbFFId2X 439MpPsFBgJDr7uWhBJePAZBk/d7jSBqaRi/RlCli0fuiqAYTCiY+8jYThI+u94ctEcZUZ/CZ QhftqmYu/KP9oY8FDP6eViNUoGZvuWnJS39Ew6FQ2U90WG3LUBM0NDM95slRnhFct1Dk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The autofs4 implementation is just a redirect to autofs now, but that also means we can't have both built into the same kernel: fs/autofs/inode.o: In function `autofs_new_ino': inode.c:(.text+0x1b8): multiple definition of `autofs_new_ino' fs/autofs/inode.o:inode.c:(.text+0x1b8): first defined here fs/autofs/inode.o: In function `autofs_clean_ino': inode.c:(.text+0x288): multiple definition of `autofs_clean_ino' There is also a problem with trying to build both in parallel, which leads to two 'make' processes writing to the same fs/autofs/.*.o.cmd file, causing corruption that manifests like fs/autofs4/../autofs/.expire.o.cmd:679: *** missing separator. Stop. Making AUTOFS4_FS depend on AUTOFS_FS being disabled should avoid all configurations that run into either issue. Fixes: mmotm ("autofs: update fs/autofs4/Makefile") Signed-off-by: Arnd Bergmann --- fs/autofs4/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 Signed-off-by: Arnd Bergmann Signed-off-by: Ian Kent Tested-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Ian Kent Signed-off-by: Andrew Morton diff --git a/fs/autofs4/Kconfig b/fs/autofs4/Kconfig index 53bc592a250d..eccf673c6c8c 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 and v5)" + depends on AUTOFS_FS=n default n help The automounter is a tool to automatically mount remote file systems