diff options
| author | Pavel Shilovsky <pshilov@microsoft.com> | 2019-01-25 11:10:00 -0800 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-03-05 18:10:01 -0600 |
| commit | f0b93cb9d10789381c2c8c3bcab2315c3dcb3311 (patch) | |
| tree | dfd862b75c25418b63bba8efe146e73a11d462f1 /fs | |
| parent | 9a1c67e8d5dad143d5166dac1ee6776f433dac00 (diff) | |
| download | linux-f0b93cb9d10789381c2c8c3bcab2315c3dcb3311.tar.gz linux-f0b93cb9d10789381c2c8c3bcab2315c3dcb3311.tar.bz2 linux-f0b93cb9d10789381c2c8c3bcab2315c3dcb3311.zip | |
CIFS: Remove custom credit adjustments for SMB2 async IO
Currently we do proper accounting for credits in regards to
reconnects and error handling, thus we do not need custom
credit adjustments when reconnect is detected developed
previously.
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 7d1e069cdcb8..49c2843b1bcf 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -3297,17 +3297,8 @@ smb2_async_readv(struct cifs_readdata *rdata) rc = smb2_new_read_req( (void **) &buf, &total_len, &io_parms, rdata, 0, 0); - if (rc) { - if (rc == -EAGAIN && rdata->credits.value) { - /* credits was reset by reconnect */ - rdata->credits.value = 0; - /* reduce in_flight value since we won't send the req */ - spin_lock(&server->req_lock); - server->in_flight--; - spin_unlock(&server->req_lock); - } + if (rc) return rc; - } if (smb3_encryption_required(io_parms.tcon)) flags |= CIFS_TRANSFORM_REQ; @@ -3515,17 +3506,8 @@ smb2_async_writev(struct cifs_writedata *wdata, unsigned int total_len; rc = smb2_plain_req_init(SMB2_WRITE, tcon, (void **) &req, &total_len); - if (rc) { - if (rc == -EAGAIN && wdata->credits.value) { - /* credits was reset by reconnect */ - wdata->credits.value = 0; - /* reduce in_flight value since we won't send the req */ - spin_lock(&server->req_lock); - server->in_flight--; - spin_unlock(&server->req_lock); - } - goto async_writev_out; - } + if (rc) + return rc; if (smb3_encryption_required(tcon)) flags |= CIFS_TRANSFORM_REQ; |