diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2019-05-06 03:00:02 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-05-08 07:24:55 +0300 |
| commit | 392e1c5dc9cc93a8fffbd6230c12c9f38693e634 (patch) | |
| tree | 2fb6728475227c50711880f1a95107a4f91e0384 /fs/cifs/transport.c | |
| parent | d69cb728e70c40268762182a62f5d5d6fa51c5b2 (diff) | |
| download | linux-392e1c5dc9cc93a8fffbd6230c12c9f38693e634.tar.xz | |
cifs: rename and clarify CIFS_ASYNC_OP and CIFS_NO_RESP
The flags were named confusingly.
CIFS_ASYNC_OP now just means that we will not block waiting for credits
to become available so we thus rename this to be CIFS_NON_BLOCKING.
Change CIFS_NO_RESP to CIFS_NO_RSP_BUF to clarify that we will actually get a
response from the server but we will not get/do not want a response buffer.
Delete CIFSSMBNotify. This is an SMB1 function that is not used.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 5573e38b13f3..9a16ff4b9f5e 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -529,7 +529,7 @@ wait_for_free_credits(struct TCP_Server_Info *server, const int num_credits, return -EAGAIN; spin_lock(&server->req_lock); - if ((flags & CIFS_TIMEOUT_MASK) == CIFS_ASYNC_OP) { + if ((flags & CIFS_TIMEOUT_MASK) == CIFS_NON_BLOCKING) { /* oplock breaks must not be held up */ server->in_flight++; *credits -= 1; @@ -838,7 +838,7 @@ SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, iov[0].iov_base = in_buf; iov[0].iov_len = get_rfc1002_length(in_buf) + 4; - flags |= CIFS_NO_RESP; + flags |= CIFS_NO_RSP_BUF; rc = SendReceive2(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov); cifs_dbg(NOISY, "SendRcvNoRsp flags %d rc %d\n", flags, rc); @@ -1151,7 +1151,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, flags & CIFS_LOG_ERROR); /* mark it so buf will not be freed by cifs_delete_mid */ - if ((flags & CIFS_NO_RESP) == 0) + if ((flags & CIFS_NO_RSP_BUF) == 0) midQ[i]->resp_buf = NULL; } @@ -1302,9 +1302,6 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, if (rc < 0) goto out; - if ((flags & CIFS_TIMEOUT_MASK) == CIFS_ASYNC_OP) - goto out; - rc = wait_for_response(ses->server, midQ); if (rc != 0) { send_cancel(ses->server, &rqst, midQ); |