diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-10-30 21:15:22 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-10-30 21:15:22 +0100 |
| commit | 61de800d33af585cb7e6f27b5cdd51029c6855cb (patch) | |
| tree | 3b16b4cca031c646a30a55218adfed6e0c59332e /fs/cifs/transport.c | |
| parent | [CIFS] Reduce number of socket retries in large write path (diff) | |
| download | linux-61de800d33af585cb7e6f27b5cdd51029c6855cb.tar.xz linux-61de800d33af585cb7e6f27b5cdd51029c6855cb.zip | |
[CIFS] fix error in smb_send2
smb_send2 exit logic was strange, and with the previous change
could cause us to fail large
smb writes when all of the smb was not sent as one chunk.
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index ba4d66644ebf..ff8243a8fe3e 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -290,8 +290,11 @@ smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec, if (rc < 0) break; - if (rc >= total_len) { - WARN_ON(rc > total_len); + if (rc == total_len) { + total_len = 0; + break; + } else if (rc > total_len) { + cERROR(1, ("sent %d requested %d", rc, total_len)); break; } if (rc == 0) { |