From: Long Li <longli@linuxonhyperv.com>
To: Steve French <sfrench@samba.org>,
linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
stable@vger.kernel.org
Cc: Long Li <longli@microsoft.com>
Subject: [PATCH 5/6] cifs: smbd: Enable signing with smbdirect
Date: Mon, 16 Apr 2018 17:49:17 -0700 [thread overview]
Message-ID: <20180417004918.29213-5-longli@linuxonhyperv.com> (raw)
In-Reply-To: <20180417004918.29213-1-longli@linuxonhyperv.com>
From: Long Li <longli@microsoft.com>
Now signing is supported with RDMA transport.
Remove the code that disabled it.
Signed-off-by: Long Li <longli@microsoft.com>
---
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 6759035..d71ce51 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;
--
2.7.4
next prev parent reply other threads:[~2018-04-17 0:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 0:49 [PATCH 1/6] cifs: smbd: Check for iov length on sending the last iov Long Li
2018-04-17 0:49 ` [PATCH 2/6] cifs: Allocate validate negoation request through kmalloc Long Li
2018-04-17 4:01 ` Parav Pandit
2018-04-17 18:11 ` Long Li
2018-04-17 7:30 ` Greg KH
2018-04-17 0:49 ` [PATCH 3/6] cifs: smbd: Avoid allocating iov on the stack Long Li
2018-04-17 7:29 ` Greg KH
2018-04-17 0:49 ` [PATCH 4/6] cifs: smbd: Don't use RDMA read/write when signing is used Long Li
2018-04-17 7:29 ` Greg KH
2018-04-17 0:49 ` Long Li [this message]
2018-04-17 7:29 ` [PATCH 5/6] cifs: smbd: Enable signing with smbdirect Greg KH
2018-04-17 0:49 ` [PATCH 6/6] cifs: smbd: Dump SMB packet when configured Long Li
2018-04-17 7:29 ` Greg KH
2018-04-17 7:29 ` [PATCH 1/6] cifs: smbd: Check for iov length on sending the last iov Greg KH
2018-04-17 17:55 ` Long Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180417004918.29213-5-longli@linuxonhyperv.com \
--to=longli@linuxonhyperv.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).