diff options
| author |   Pavel Shilovsky <pshilov@microsoft.com> | 2019-01-16 11:12:41 -0800 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2019-03-05 18:10:01 -0600 |
| commit | 335b7b62ffb69d18055f2bb6f3a029263a07c735 (patch) | |
| tree | 27d3e4a9edd427da8e4bae69a4e54b37c89d661a /fs/cifs/connect.c | |
| parent | CIFS: Set reconnect instance to one initially (diff) | |
| download | linux-dev-335b7b62ffb69d18055f2bb6f3a029263a07c735.tar.xz linux-dev-335b7b62ffb69d18055f2bb6f3a029263a07c735.zip | |
CIFS: Respect reconnect in MTU credits calculations
Every time after a session reconnect we don't need to account for
credits obtained in previous sessions. Introduce new struct cifs_credits
which contains both credits value and reconnect instance of the
time those credits were taken. Modify a routine that add credits
back to handle the reconnect instance by assuming zero credits
if the reconnect happened after the credits were obtained and
before we decided to add them back due to some errors during sending.
This patch fixes the MTU credits cases. The subsequent patch
will handle non-MTU ones.
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 46bee3b4eeed..b95db2b593cb 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -593,6 +593,7 @@ cifs_reconnect(struct TCP_Server_Info *server) msleep(3000); } else { atomic_inc(&tcpSesReconnectCount); + set_credits(server, 1); spin_lock(&GlobalMid_Lock); if (server->tcpStatus != CifsExiting) server->tcpStatus = CifsNeedNegotiate; @@ -4951,8 +4952,6 @@ cifs_negotiate_protocol(const unsigned int xid, struct cifs_ses *ses) if (!server->ops->need_neg(server)) return 0; - set_credits(server, 1); - rc = server->ops->negotiate(xid, ses); if (rc == 0) { spin_lock(&GlobalMid_Lock); |