From patchwork Tue Dec 19 10:12:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10122939 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 9421A60390 for ; Tue, 19 Dec 2017 10:13:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80F4628FAC for ; Tue, 19 Dec 2017 10:13:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74037291D2; Tue, 19 Dec 2017 10:13:50 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18B5028FAC for ; Tue, 19 Dec 2017 10:13:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761689AbdLSKNi (ORCPT ); Tue, 19 Dec 2017 05:13:38 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:51092 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759262AbdLSKNe (ORCPT ); Tue, 19 Dec 2017 05:13:34 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MAdeV-1eH2Qt23Xn-00BrQr; Tue, 19 Dec 2017 11:13:28 +0100 From: Arnd Bergmann To: Steve French Cc: Arnd Bergmann , Pavel Shilovsky , Jean Delvare , Long Li , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org Subject: [PATCH] CIFS: SMBD: fix configurations with INFINIBAND=m Date: Tue, 19 Dec 2017 11:12:57 +0100 Message-Id: <20171219101327.2165797-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:T5nPVjTrVEObPTz+xwZgl1yPYclRESP+T96GcI0Ju1BzTbQ0FKZ BV9k0skPyEpuxwTBvxRn89heBB2A5Wgr+AWwKu42rykkvQAYLjieW5Y1tiSR5BCZmjnRzk9 1y/BZheHf5ufFd/QSNNw9eK6oJ5XsTnytfkundLnsYTfZwIUcbgW2Y+LFf1awntAJK2nI7l M81koTTn6vsulPybBWfBA== X-UI-Out-Filterresults: notjunk:1; V01:K0:vpXcfPnxyNg=:XWDBAQsiZLoG+r23YRltXd hwyu0EkkJmSVXPo9r2n4fPAD4BUYNNISjNRWHrDqNCgIbHSaXTsQz4CjQ5QKEanMJzMoYTcCx sfpJ8ApigMg6Ll0mdT48DpNbWntZo8hQHyKaGzTxcL5lCcpGV2GzNL/bp83xDSycciLXr8tBT H3WMCUb9qDQ7hD8QFeI4KpZq5BRiknwBv3tScHUJ00fhhz5iFft+prahd9QhKK9LW15NGY18e sX+i2WudzAgfehcFp6SMbQ270AYTU7LnhKd0GLVWdWsMno9o+qtygB054NTU+rl7XQ60+7KU/ 45iay08y+BS3Jnj8ZMKLMib1R5MGINksAfCsLBrozas/8jGHWvx3Hh/KjS8BuKB/Y1sPIua6M YWR/L6QjrTiG63Jj1rR2g04ll9U7M0cTiG+eFuhNDn4kvfIxWaWsNviLu1g/Ua2zJjINOWhWv 3EkYy6L6so4y1r1o9xz4cvLL/Cn9Mpmfi+4/ng92dfRSbDYijFOMGfrmtIQSZf6yEPMwd0q61 Sw6pzM8290SRVey2R/KK6mkvTh7RCXllQOT8CGD51zncvxkeuTYu0AT829CDE7SL4HV/mE5ZL 1gzH6fHfulxjVmb9hdgqiqhDeiwamH82CL7Id1988HOkmfNzdcbcX0FfkD3h275OHS2TcPZkV 7+rdk48xAI7XCxgJWzfaHcUFx3Sk1nKjVw3aAkOquuzr3Rrth9w7k+mxUCqbc089UvCUdQn3/ ADNIwkgA73baT3xxyS7qniV3pqwvCpaSkd/JnQ== Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A built-in SMB file system cannot link against a modular infiniband core module: fs/cifs/smbdirect.o: In function `smbd_destroy_rdma_work': smbdirect.c:(.text+0x28e3): undefined reference to `ib_drain_qp' smbdirect.c:(.text+0x2915): undefined reference to `rdma_destroy_qp' smbdirect.c:(.text+0x2d08): undefined reference to `ib_free_cq' smbdirect.c:(.text+0x2d3d): undefined reference to `ib_free_cq' smbdirect.c:(.text+0x2d6f): undefined reference to `ib_dealloc_pd' smbdirect.c:(.text+0x2d9a): undefined reference to `rdma_destroy_id' fs/cifs/smbdirect.o: In function `smbd_disconnect_rdma_work': smbdirect.c:(.text+0x3d3e): undefined reference to `rdma_disconnect' fs/cifs/smbdirect.o: In function `_smbd_get_connection': smbdirect.c:(.text+0x5bc2): undefined reference to `rdma_create_id' smbdirect.c:(.text+0x5cc5): undefined reference to `rdma_resolve_addr' smbdirect.c:(.text+0x5cda): undefined reference to `rdma_destroy_id' smbdirect.c:(.text+0x5da7): undefined reference to `rdma_destroy_id' smbdirect.c:(.text+0x5e89): undefined reference to `rdma_resolve_route' smbdirect.c:(.text+0x5f07): undefined reference to `rdma_destroy_id' This changes the Kconfig dependency to enforce selecting one of the valid configurations. Fixes: bbc50d2ad317 ("CIFS: SMBD: Introduce kernel config option CONFIG_CIFS_SMB_DIRECT") Signed-off-by: Arnd Bergmann Reviewed-by: Jean Delvare --- fs/cifs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig index 500fd69fb58b..3bfc55c08bef 100644 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig @@ -199,6 +199,7 @@ config CIFS_SMB311 config CIFS_SMB_DIRECT bool "SMB Direct support (Experimental)" depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y help Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1. SMB Direct allows transferring SMB packets over RDMA. If unsure,