diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-12 18:49:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-12 18:49:53 -0700 |
| commit | ccda3c4b77777f66aeb3c531352bb40d59501c59 (patch) | |
| tree | 1f06e12e644bd24d35df6924b85cfceed3947bfb /fs/cifs/connect.c | |
| parent | 427fbe89261d8f11cd20b5a4ba94e977061f69d6 (diff) | |
| parent | 6e70c267e68d77679534dcf4aaf84e66f2cf1425 (diff) | |
| download | linux-ccda3c4b77777f66aeb3c531352bb40d59501c59.tar.bz2 | |
Merge tag '4.17-rc4-SMB3-Fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Some small SMB3 fixes for 4.17-rc5, some for stable"
* tag '4.17-rc4-SMB3-Fixes' of git://git.samba.org/sfrench/cifs-2.6:
smb3: directory sync should not return an error
cifs: smb2ops: Fix listxattr() when there are no EAs
cifs: smbd: Enable signing with smbdirect
cifs: Allocate validate negotiation request through kmalloc
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index a5aa158d535a..7a10a5d0731f 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) { |