leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cifs: pass flags down into wait_for_free_credits()

Browse Source 
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
This commit is contained in:
Ronnie Sahlberg 2019-03-08 12:58:19 +10:00 committed by Steve French
parent 480b1cb9da
commit 4230cff8c0
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/cifs/transport.c
View File

@ -486,15 +486,24 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer,
} }
static int static int
wait_for_free_credits(struct TCP_Server_Info *server, const int timeout, wait_for_free_credits(struct TCP_Server_Info *server, const int flags,
int *credits, unsigned int *instance) unsigned int *instance)
{ {
int rc; int rc;
int *credits;
int optype;
optype = flags & CIFS_OP_MASK;
*instance = 0; *instance = 0;
credits = server->ops->get_credits_field(server, optype);
/* Since an echo is already inflight, no need to wait to send another */
if (*credits <= 0 && optype == CIFS_ECHO_OP)
return -EAGAIN;
spin_lock(&server->req_lock); spin_lock(&server->req_lock);
if (timeout == CIFS_ASYNC_OP) { if ((flags & CIFS_TIMEOUT_MASK) == CIFS_ASYNC_OP) {
/* oplock breaks must not be held up */ /* oplock breaks must not be held up */
server->in_flight++; server->in_flight++;
*credits -= 1; *credits -= 1;
@ -525,7 +534,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int timeout,
*/ */
/* update # of requests on the wire to server */ /* update # of requests on the wire to server */
if (timeout != CIFS_BLOCKING_OP) { if ((flags & CIFS_TIMEOUT_MASK) != CIFS_BLOCKING_OP) {
*credits -= 1; *credits -= 1;
server->in_flight++; server->in_flight++;
*instance = server->reconnect_instance; *instance = server->reconnect_instance;
@ -541,18 +550,7 @@ static int
wait_for_free_request(struct TCP_Server_Info *server, const int flags, wait_for_free_request(struct TCP_Server_Info *server, const int flags,
unsigned int *instance) unsigned int *instance)
{ {
int *val; return wait_for_free_credits(server, flags, instance);
int timeout, optype;
timeout = flags & CIFS_TIMEOUT_MASK;
optype = flags & CIFS_OP_MASK;
val = server->ops->get_credits_field(server, optype);
/* Since an echo is already inflight, no need to wait to send another */
if (*val <= 0 && optype == CIFS_ECHO_OP)
return -EAGAIN;
return wait_for_free_credits(server, timeout, val, instance);
} }
int int