]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
CIFS: Remove custom credit adjustments for SMB2 async IO
authorPavel Shilovsky <pshilov@microsoft.com>
Fri, 25 Jan 2019 19:10:00 +0000 (11:10 -0800)
committerSteve French <stfrench@microsoft.com>
Wed, 6 Mar 2019 00:10:01 +0000 (18:10 -0600)
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>
fs/cifs/smb2pdu.c

index 7d1e069cdcb8216771a63bb6c9427c9e9bde4a43..49c2843b1bcfd425da46533e451788dd08873499 100644 (file)
@@ -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;