From patchwork Wed Apr 25 18:30:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 904662 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 40WTL96y6sz9s0v for ; Thu, 26 Apr 2018 04:31:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755712AbeDYSb2 (ORCPT ); Wed, 25 Apr 2018 14:31:28 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:46822 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752902AbeDYSb1 (ORCPT ); Wed, 25 Apr 2018 14:31:27 -0400 Received: from linuxonhyperv2.linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id BPBIfuP81lLMSBPBIfTAAA; Wed, 25 Apr 2018 11:30:26 -0700 x-originating-ip: 107.180.71.197 Received: from longli by linuxonhyperv2.linuxonhyperv.com with local (Exim 4.89_1) (envelope-from ) id 1fBPBI-0002Rd-92; Wed, 25 Apr 2018 11:30:16 -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 Subject: [PATCH rebased] cifs: smbd: Enable signing with smbdirect Date: Wed, 25 Apr 2018 11:30:05 -0700 Message-Id: <20180425183005.9347-2-longli@linuxonhyperv.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180425183005.9347-1-longli@linuxonhyperv.com> References: <20180425183005.9347-1-longli@linuxonhyperv.com> Reply-To: longli@microsoft.com X-CMAE-Envelope: MS4wfNg/tOEB4jYckg5T6oRTexEvnwYHZJlFHXSnUVgYWUNhtpiJYrmG8N0YWmwTYm1HGPrBvdOly3N1GAg/qX/q383RlgdCCXbIsa4t9WNOUCtMWAM+cTVX 5o6BJ9MmFGq/C3d0OxHtUy8NqHjm8XZziQAOilSZOpDhV1ZdZCcqDGb2+K8XgGjdVF2CFDEYmiJtvUs72M9L65DRC49PUxBIhJavwKq5j2LakQfa/NLLz+VM 65pC8JsGwTOCNOp3Vi7nd3jowclr0HEMeLKmMZXHpKVI263+mx1df7whltiaF4YeHCHTvOs+3FLrJiTj7XrHBEJ01aEdG4TeKlOMSi1QEZtGAQcnyMSOZgO3 sTTaRqyb8YA9hweC2Y9vhlCAbF12/ohZuqKCiPH7eioCPI8zdfe8oy+zlUrqDJqWSaaQz3s3 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 --- fs/cifs/connect.c | 8 -------- fs/cifs/smb2pdu.c | 5 ----- 2 files changed, 13 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 8472f32..b16f953 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -737,11 +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 - /* In SMB3.11 preauth integrity supersedes validate negotiate */ if (tcon->ses->server->dialect == SMB311_PROT_ID) return 0;