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>

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 65faad3aa69a8f7ed9fa805fdca025d36f700fcb..c22ab330238c509a4453f9bd31e1da2893e070a2 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1689,11 +1689,11 @@ static inline bool is_retryable_error(int error)
 
 /* Type of Request to SendReceive2 */
 #define   CIFS_BLOCKING_OP      1    /* operation can block */
-#define   CIFS_ASYNC_OP         2    /* do not wait for response */
+#define   CIFS_NON_BLOCKING     2    /* do not block waiting for credits */
 #define   CIFS_TIMEOUT_MASK 0x003    /* only one of above set in req */
 #define   CIFS_LOG_ERROR    0x010    /* log NT STATUS if non-zero */
 #define   CIFS_LARGE_BUF_OP 0x020    /* large request buffer */
-#define   CIFS_NO_RESP      0x040    /* no response buffer required */
+#define   CIFS_NO_RSP_BUF   0x040    /* no response buffer required */
 
 /* Type of request operation */
 #define   CIFS_ECHO_OP      0x080    /* echo request */

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 6050851edcb824b254f82fc3e75fe1790cf015ff..1fbd92843a73bc8899e47b1f50a6461a32eb06fa 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -860,7 +860,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server)
        iov[1].iov_base = (char *)smb + 4;
 
        rc = cifs_call_async(server, &rqst, NULL, cifs_echo_callback, NULL,
-                            server, CIFS_ASYNC_OP | CIFS_ECHO_OP, NULL);
+                            server, CIFS_NON_BLOCKING | CIFS_ECHO_OP, NULL);
        if (rc)
                cifs_dbg(FYI, "Echo request failed: %d\n", rc);
 
@@ -2508,8 +2508,8 @@ int cifs_lockv(const unsigned int xid, struct cifs_tcon *tcon,
        iov[1].iov_len = (num_unlock + num_lock) * sizeof(LOCKING_ANDX_RANGE);
 
        cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);
-       rc = SendReceive2(xid, tcon->ses, iov, 2, &resp_buf_type, CIFS_NO_RESP,
-                         &rsp_iov);
+       rc = SendReceive2(xid, tcon->ses, iov, 2, &resp_buf_type,
+                         CIFS_NO_RSP_BUF, &rsp_iov);
        cifs_small_buf_release(pSMB);
        if (rc)
                cifs_dbg(FYI, "Send error in cifs_lockv = %d\n", rc);
@@ -2540,7 +2540,7 @@ CIFSSMBLock(const unsigned int xid, struct cifs_tcon *tcon,
 
        if (lockType == LOCKING_ANDX_OPLOCK_RELEASE) {
                /* no response expected */
-               flags = CIFS_NO_SRV_RSP | CIFS_ASYNC_OP | CIFS_OBREAK_OP;
+               flags = CIFS_NO_SRV_RSP | CIFS_NON_BLOCKING | CIFS_OBREAK_OP;
                pSMB->Timeout = 0;
        } else if (waitFlag) {
                flags = CIFS_BLOCKING_OP; /* blocking operation, no timeout */
@@ -6567,93 +6567,3 @@ SetEARetry:
        return rc;
 }
 #endif
-
-#ifdef CONFIG_CIFS_DNOTIFY_EXPERIMENTAL /* BB unused temporarily */
-/*
- *     Years ago the kernel added a "dnotify" function for Samba server,
- *     to allow network clients (such as Windows) to display updated
- *     lists of files in directory listings automatically when
- *     files are added by one user when another user has the
- *     same directory open on their desktop.  The Linux cifs kernel
- *     client hooked into the kernel side of this interface for
- *     the same reason, but ironically when the VFS moved from
- *     "dnotify" to "inotify" it became harder to plug in Linux
- *     network file system clients (the most obvious use case
- *     for notify interfaces is when multiple users can update
- *     the contents of the same directory - exactly what network
- *     file systems can do) although the server (Samba) could
- *     still use it.  For the short term we leave the worker
- *     function ifdeffed out (below) until inotify is fixed
- *     in the VFS to make it easier to plug in network file
- *     system clients.  If inotify turns out to be permanently
- *     incompatible for network fs clients, we could instead simply
- *     expose this config flag by adding a future cifs (and smb2) notify ioctl.
- */
-int CIFSSMBNotify(const unsigned int xid, struct cifs_tcon *tcon,
-                 const int notify_subdirs, const __u16 netfid,
-                 __u32 filter, struct file *pfile, int multishot,
-                 const struct nls_table *nls_codepage)
-{
-       int rc = 0;
-       struct smb_com_transaction_change_notify_req *pSMB = NULL;
-       struct smb_com_ntransaction_change_notify_rsp *pSMBr = NULL;
-       struct dir_notify_req *dnotify_req;
-       int bytes_returned;
-
-       cifs_dbg(FYI, "In CIFSSMBNotify for file handle %d\n", (int)netfid);
-       rc = smb_init(SMB_COM_NT_TRANSACT, 23, tcon, (void **) &pSMB,
-                     (void **) &pSMBr);
-       if (rc)
-               return rc;
-
-       pSMB->TotalParameterCount = 0 ;
-       pSMB->TotalDataCount = 0;
-       pSMB->MaxParameterCount = cpu_to_le32(2);
-       pSMB->MaxDataCount = cpu_to_le32(CIFSMaxBufSize & 0xFFFFFF00);
-       pSMB->MaxSetupCount = 4;
-       pSMB->Reserved = 0;
-       pSMB->ParameterOffset = 0;
-       pSMB->DataCount = 0;
-       pSMB->DataOffset = 0;
-       pSMB->SetupCount = 4; /* single byte does not need le conversion */
-       pSMB->SubCommand = cpu_to_le16(NT_TRANSACT_NOTIFY_CHANGE);
-       pSMB->ParameterCount = pSMB->TotalParameterCount;
-       if (notify_subdirs)
-               pSMB->WatchTree = 1; /* one byte - no le conversion needed */
-       pSMB->Reserved2 = 0;
-       pSMB->CompletionFilter = cpu_to_le32(filter);
-       pSMB->Fid = netfid; /* file handle always le */
-       pSMB->ByteCount = 0;
-
-       rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,
-                        (struct smb_hdr *)pSMBr, &bytes_returned,
-                        CIFS_ASYNC_OP);
-       if (rc) {
-               cifs_dbg(FYI, "Error in Notify = %d\n", rc);
-       } else {
-               /* Add file to outstanding requests */
-               /* BB change to kmem cache alloc */
-               dnotify_req = kmalloc(
-                                               sizeof(struct dir_notify_req),
-                                                GFP_KERNEL);
-               if (dnotify_req) {
-                       dnotify_req->Pid = pSMB->hdr.Pid;
-                       dnotify_req->PidHigh = pSMB->hdr.PidHigh;
-                       dnotify_req->Mid = pSMB->hdr.Mid;
-                       dnotify_req->Tid = pSMB->hdr.Tid;
-                       dnotify_req->Uid = pSMB->hdr.Uid;
-                       dnotify_req->netfid = netfid;
-                       dnotify_req->pfile = pfile;
-                       dnotify_req->filter = filter;
-                       dnotify_req->multishot = multishot;
-                       spin_lock(&GlobalMid_Lock);
-                       list_add_tail(&dnotify_req->lhead,
-                                       &GlobalDnotifyReqList);
-                       spin_unlock(&GlobalMid_Lock);
-               } else
-                       rc = -ENOMEM;
-       }
-       cifs_buf_release(pSMB);
-       return rc;
-}
-#endif /* was needed for dnotify, and will be needed for inotify when VFS fix */

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 634800c0bc0687f9572939c4708858cd3d0f14f2..035a568b3dbde04fcfdbf74808e531317810358e 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1538,7 +1538,7 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)
        else if (server->sign)
                req->sync_hdr.Flags |= SMB2_FLAGS_SIGNED;
 
-       flags |= CIFS_NO_RESP;
+       flags |= CIFS_NO_RSP_BUF;
 
        iov[0].iov_base = (char *)req;
        iov[0].iov_len = total_len;
@@ -1739,7 +1739,7 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
        if (smb3_encryption_required(tcon))
                flags |= CIFS_TRANSFORM_REQ;
 
-       flags |= CIFS_NO_RESP;
+       flags |= CIFS_NO_RSP_BUF;
 
        iov[0].iov_base = (char *)req;
        iov[0].iov_len = total_len;
@@ -4166,7 +4166,7 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
        req->OplockLevel = oplock_level;
        req->sync_hdr.CreditRequest = cpu_to_le16(1);
 
-       flags |= CIFS_NO_RESP;
+       flags |= CIFS_NO_RSP_BUF;
 
        iov[0].iov_base = (char *)req;
        iov[0].iov_len = total_len;
@@ -4440,7 +4440,7 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
        struct kvec rsp_iov;
        int resp_buf_type;
        unsigned int count;
-       int flags = CIFS_NO_RESP;
+       int flags = CIFS_NO_RSP_BUF;
        unsigned int total_len;
 
        cifs_dbg(FYI, "smb2_lockv num lock %d\n", num_lock);
@@ -4533,7 +4533,7 @@ SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
        memcpy(req->LeaseKey, lease_key, 16);
        req->LeaseState = lease_state;
 
-       flags |= CIFS_NO_RESP;
+       flags |= CIFS_NO_RSP_BUF;
 
        iov[0].iov_base = (char *)req;
        iov[0].iov_len = total_len;

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 5573e38b13f33cdee69b8b072d1e227ec65bb8ec..9a16ff4b9f5ef09a27d59d583a167e209888ba18 100644 (file)
--- 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);