diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2018-06-28 02:47:14 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2018-07-05 20:48:24 +0200 |
| commit | 81f39f951b8098b1c59b01ad10d06d7dc01c7019 (patch) | |
| tree | 220f25cf5198753014f35ee11a9722d3a7df4e7d /fs/cifs/smbdirect.h | |
| parent | cifs: Fix validation of signed data in smb2 (diff) | |
| download | linux-81f39f951b8098b1c59b01ad10d06d7dc01c7019.tar.xz linux-81f39f951b8098b1c59b01ad10d06d7dc01c7019.zip | |
cifs: fix SMB1 breakage
SMB1 mounting broke in commit 35e2cc1ba755
("cifs: Use correct packet length in SMB2_TRANSFORM header")
Fix it and also rename smb2_rqst_len to smb_rqst_len
to make it less unobvious that the function is also called from
CIFS/SMB1
Good job by Paulo reviewing and cleaning up Ronnie's original patch.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: Paulo Alcantara <palcantara@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smbdirect.h')
| -rw-r--r-- | fs/cifs/smbdirect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h index 1e419c21dc60..a11096254f29 100644 --- a/fs/cifs/smbdirect.h +++ b/fs/cifs/smbdirect.h @@ -292,7 +292,7 @@ void smbd_destroy(struct smbd_connection *info); /* Interface for carrying upper layer I/O through send/recv */ int smbd_recv(struct smbd_connection *info, struct msghdr *msg); -int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst); +int smbd_send(struct TCP_Server_Info *server, struct smb_rqst *rqst); enum mr_state { MR_READY, @@ -332,7 +332,7 @@ static inline void *smbd_get_connection( static inline int smbd_reconnect(struct TCP_Server_Info *server) {return -1; } static inline void smbd_destroy(struct smbd_connection *info) {} static inline int smbd_recv(struct smbd_connection *info, struct msghdr *msg) {return -1; } -static inline int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst) {return -1; } +static inline int smbd_send(struct TCP_Server_Info *server, struct smb_rqst *rqst) {return -1; } #endif #endif |