From patchwork Wed Apr 4 09:54:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10322333 X-Patchwork-Delegate: snitzer@redhat.com 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 A7F2260318 for ; Wed, 4 Apr 2018 09:57:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 992C0206AF for ; Wed, 4 Apr 2018 09:57:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D88828DBE; Wed, 4 Apr 2018 09:57:30 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2EEC206AF for ; Wed, 4 Apr 2018 09:57:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B182580C22; Wed, 4 Apr 2018 09:57:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9352189D5; Wed, 4 Apr 2018 09:57:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E386E1800C9F; Wed, 4 Apr 2018 09:57:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w349sqNT023277 for ; Wed, 4 Apr 2018 05:54:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0ADFA821F0; Wed, 4 Apr 2018 09:54:52 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7DFD817D59; Wed, 4 Apr 2018 09:54:38 +0000 (UTC) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C9C1C04BD33; Wed, 4 Apr 2018 09:54:37 +0000 (UTC) Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0Li5PX-1eiKwA48iB-00nPXD; Wed, 04 Apr 2018 11:54:30 +0200 From: Arnd Bergmann To: Dan Williams , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Shaohua Li Date: Wed, 4 Apr 2018 11:54:15 +0200 Message-Id: <20180404095427.2537184-1-arnd@arndb.de> X-Provags-ID: V03:K1:XF3krF2cufn5ZqbP1HwLxfM9yMhIKbJ0j+SUPY/m6Jgd7+zUvrc dBe7Tapg94uK6OvZ7XQh3GeSLkg9K3Oic0yNIAw287U+QpUfU8fmnLqM+wM+rb+BvkkM8Zu Zg2EJ0a9Hpq1ONgNgEN3xzYtWs3/t6KPPxPt3cUYzKuIg/Eb0OuJ280OiRx+hzCyhzIpZna SrRikSFiky6l/69apegbg== X-UI-Out-Filterresults: notjunk:1; V01:K0:nSWNP0NIF80=:ldmkHYkY5GMm6bSTtb/Coo oRUrLxXzhmMXyOwh2V1tqqBGBgZSs+9J9nu9/BzT6KldwJLlyU4VBFnyhDP+p8UQNuVsEJ8zN ZkTXQb1TDkqsKNK/FwVV7NnXF0cWyD1az2OXJx/oOu0XZ6FQLswJL8B/Cc1mGylmDR1eKWQ/t SCmVEphXOoEW5Dxf8SnPqKmsF335xrTQZmXOf77RYJTWLbytDNM4g71JfQIfHv54QaKNhDzNg WnY3+pA3vGubntstyDR2UwQiMkhqXkKpx48a656oc2m7V6iWu1be6FY3zmldQiWUXGFP1O3CC M/+Aad85y9PtKsjATBCeZZBYieKKlbbUHA+V/fz2viPHN+OEUy8U/IJIFlEoixRW+NlXF5pCj vk2Gm5p6itWzMXgTxs4YSvtnetPjO+mhCRto9TX0G8H2tcFcz39/Wjrdaikb8nSd10yHJtRS2 zhh1uUJyl8Vd6buxl5KfmHRKuiFL+ss2Q4aqw4mcz6dvOlcK6PgurzP9gg9/CPxUrnJ7PpdaC xK7pd+fSq+bh62vNbvH61mqMGiT55toiG0fG2LKxVC5MVgIm9GkJV+kVosLxigFTU5zXjPTyf W+5F3D4AdN/QMnRm6k3Ul3/zbV1UcWokGzsz2I/ScdAQAs+kI521Ipe9DXHGg7ED8f5MKFDtU QISknX5IC9wXJ1rS3jQdXtRK8PlnN0O8zkG7cM77RSSJB0xhLWnafLM7htCsbT72ikI6FgL9x NQ1Iu8pSzXCwnvNGCBpc+6KQugc69y2n5c7Fhg== X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 04 Apr 2018 09:54:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 04 Apr 2018 09:54:37 +0000 (UTC) for IP:'212.227.126.134' DOMAIN:'mout.kundenserver.de' HELO:'mout.kundenserver.de' FROM:'arnd@arndb.de' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 212.227.126.134 mout.kundenserver.de 212.227.126.134 mout.kundenserver.de X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: dm-devel@redhat.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [dm-devel] [PATCH] dm: fix DAX dependency X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 04 Apr 2018 09:57:28 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP Building device mapper with CONFIG_DAX=m now results in a link error: drivers/md/dm.o: In function `dm_put_table_device': dm.c:(.text+0x33c): undefined reference to `put_dax' drivers/md/dm.o: In function `cleanup_mapped_device': dm.c:(.text+0x1054): undefined reference to `kill_dax' dm.c:(.text+0x105c): undefined reference to `put_dax' drivers/md/dm.o: In function `dm_get_table_device': dm.c:(.text+0x2744): undefined reference to `dax_get_by_host' drivers/md/dm-table.o: In function `device_dax_write_cache_enabled': dm-table.c:(.text+0x1030): undefined reference to `dax_write_cache_enabled' drivers/md/dm-table.o: In function `dm_table_set_restrictions': dm-table.c:(.text+0x29b8): undefined reference to `dax_write_cache' This adds a dependency that prevents the invalid configuration, allowing a built-in device mapper only if DAX is either built-in as well, or completely disabled. Fixes: 4de1c562f7e9 ("dax, dm: allow device-mapper to operate without dax support") Signed-off-by: Arnd Bergmann Reviewed-by: Mike Snitzer --- The regression only showed up in linux-next at the start of the merge window. Any idea what happened? --- drivers/md/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index 49287135b86c..5e5a47c5ff82 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -200,6 +200,7 @@ config BLK_DEV_DM_BUILTIN config BLK_DEV_DM tristate "Device mapper support" + depends on DAX || DAX=n select BLK_DEV_DM_BUILTIN ---help--- Device-mapper is a low level volume manager. It works by allowing