From patchwork Tue Apr 17 19:17:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 899603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxonhyperv.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40QZp74Jphz9s1d for ; Wed, 18 Apr 2018 05:20:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752606AbeDQTSV (ORCPT ); Tue, 17 Apr 2018 15:18:21 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:58222 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbeDQTSU (ORCPT ); Tue, 17 Apr 2018 15:18:20 -0400 Received: from linuxonhyperv2.linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id 8W6QfQV6l6Zjp8W6Qf4Z5n; Tue, 17 Apr 2018 12:17:18 -0700 x-originating-ip: 107.180.71.197 Received: from longli by linuxonhyperv2.linuxonhyperv.com with local (Exim 4.89_1) (envelope-from ) id 1f8W6Q-0003sh-Ag; Tue, 17 Apr 2018 12:17:18 -0700 From: Long Li To: Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org Cc: Long Li , stable@vger.kernel.org Subject: [Patch v2 5/6] cifs: smbd: Enable signing with smbdirect Date: Tue, 17 Apr 2018 12:17:09 -0700 Message-Id: <20180417191710.14855-5-longli@linuxonhyperv.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180417191710.14855-1-longli@linuxonhyperv.com> References: <20180417191710.14855-1-longli@linuxonhyperv.com> Reply-To: longli@microsoft.com X-CMAE-Envelope: MS4wfHD7VcRwIxPLpH+5DBXZ0ULh1zpAWDLncT0HGY6UwY+fB8qv2r7Xb/wVkb4KbA56o5fO1lHnVaUFEqxpMR170TKDRwHDorkNxu6nrd008mDLEzWuiwAX i8+7XjnufibTxdV5jgBYm82uGIB1KHKFMOHOnzRW/x7qEhrR8G0c/f1NDg1I50jGwl0GpPqStGbJMwWumd8ReNWzfKqui6wkHiO77IhEyPyHunFggv5zQUnO W7Yg/RwYo6OtRUgOWiSQnfTVA9SUbVY96hDg2m/FF/mjG6nujgpwylJ+lnBM8kk/pRq5jTjtvrUriz5JRb/z+10GvtH8mNjGbOpNwXdY4sgc6KjrWeLyEelA XiLLX4DLxnIUMU2hhmZdUpcLCu5zDrIHd7vuEgIDpUVTdqBKYID5bYs0q+uJJcpNoTkNH5cxJo/ige3+NefnBrPcs2rZ3yt4ojRQ5cXmc/h3UohNUaI= Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Long Li Now signing is supported with RDMA transport. Remove the code that disabled it. Signed-off-by: Long Li Cc: stable@vger.kernel.org --- fs/cifs/connect.c | 8 -------- fs/cifs/smb2pdu.c | 4 ---- 2 files changed, 12 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e8830f0..deef270 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1977,14 +1977,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, goto cifs_parse_mount_err; } -#ifdef CONFIG_CIFS_SMB_DIRECT - if (vol->rdma && vol->sign) { - cifs_dbg(VFS, "Currently SMB direct doesn't support signing." - " This is being fixed\n"); - goto cifs_parse_mount_err; - } -#endif - #ifndef CONFIG_KEYS /* Muliuser mounts require CONFIG_KEYS support */ if (vol->multiuser) { diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 33f612f..3e052a0 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -737,10 +737,6 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) cifs_dbg(FYI, "validate negotiate\n"); -#ifdef CONFIG_CIFS_SMB_DIRECT - if (tcon->ses->server->rdma) - return 0; -#endif pneg_inbuf = kmalloc(sizeof(*pneg_inbuf), GFP_KERNEL); if (!pneg_inbuf) return -ENOMEM;