On Mon, Apr 16, 2018 at 05:49:17PM -0700, Long Li wrote:
> From: Long Li <longli@xxxxxxxxxxxxx>
>
> Now signing is supported with RDMA transport.
>
> Remove the code that disabled it.
>
> Signed-off-by: Long Li <longli@xxxxxxxxxxxxx>
> ---
> 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
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>