CIFS: Add mid handle callback

BugLink: http://bugs.launchpad.net/bugs/1670508
We need to process read responses differently because the data
should go directly into preallocated pages. This can be done
by specifying a mid handle callback.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
(cherry picked from commit 9b7c18a2d4b798963ea80f6769701dcc4c24b55e)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 39e320fef1173dd553f996a251bb24f171b71490..5da52ccc9cd368e35dba2280e5ed8d4ac9f13913 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1304,6 +1304,13 @@ typedef int (mid_receive_t)(struct TCP_Server_Info *server,
  */
 typedef void (mid_callback_t)(struct mid_q_entry *mid);
 
+/*
+ * This is the protopyte for mid handle function. This is called once the mid
+ * has been recognized after decryption of the message.
+ */
+typedef int (mid_handle_t)(struct TCP_Server_Info *server,
+                           struct mid_q_entry *mid);
+
 /* one of these for every pending CIFS request to the server */
 struct mid_q_entry {
        struct list_head qhead; /* mids waiting on reply from this server */
@@ -1318,6 +1325,7 @@ struct mid_q_entry {
 #endif
        mid_receive_t *receive; /* call receive callback */
        mid_callback_t *callback; /* call completion callback */
+       mid_handle_t *handle; /* call handle mid callback */
        void *callback_data;      /* general purpose pointer for callback */
        void *resp_buf;         /* pointer to received SMB header */
        int mid_state;  /* wish this were enum but can not pass to wait_event */

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 41a66f4ef200c2513843c53adc167e70ea34218b..42b9f17e5d786d16a3d30822d92ed9a63b8f9306 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -77,7 +77,7 @@ extern void cifs_wake_up_task(struct mid_q_entry *mid);
 extern int cifs_call_async(struct TCP_Server_Info *server,
                        struct smb_rqst *rqst,
                        mid_receive_t *receive, mid_callback_t *callback,
-                       void *cbdata, const int flags);
+                       mid_handle_t *handle, void *cbdata, const int flags);
 extern int cifs_send_recv(const unsigned int xid, struct cifs_ses *ses,
                          struct smb_rqst *rqst, int *resp_buf_type,
                          const int flags, struct kvec *resp_iov);

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 4c57f059401895c62e76616061f36206e12f735a..e51863a3d0e5e976dd7b0e0a9425b5a1e0dfca76 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -734,7 +734,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server)
        iov[1].iov_len = get_rfc1002_length(smb);
        iov[1].iov_base = (char *)smb + 4;
 
-       rc = cifs_call_async(server, &rqst, NULL, cifs_echo_callback,
+       rc = cifs_call_async(server, &rqst, NULL, cifs_echo_callback, NULL,
                             server, CIFS_ASYNC_OP | CIFS_ECHO_OP);
        if (rc)
                cifs_dbg(FYI, "Echo request failed: %d\n", rc);
@@ -1658,7 +1658,7 @@ cifs_async_readv(struct cifs_readdata *rdata)
 
        kref_get(&rdata->refcount);
        rc = cifs_call_async(tcon->ses->server, &rqst, cifs_readv_receive,
-                            cifs_readv_callback, rdata, 0);
+                            cifs_readv_callback, NULL, rdata, 0);
 
        if (rc == 0)
                cifs_stats_inc(&tcon->stats.cifs_stats.num_reads);
@@ -2178,7 +2178,7 @@ cifs_async_writev(struct cifs_writedata *wdata,
 
        kref_get(&wdata->refcount);
        rc = cifs_call_async(tcon->ses->server, &rqst, NULL,
-                               cifs_writev_callback, wdata, 0);
+                               cifs_writev_callback, NULL, wdata, 0);
 
        if (rc == 0)
                cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index c85497bf1ae9959cbebe8f7e99efcba7d55c4b18..dd344c71334bf33fe1ab7a264e626297c11ee15b 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2142,8 +2142,8 @@ SMB2_echo(struct TCP_Server_Info *server)
        iov[1].iov_len = get_rfc1002_length(req);
        iov[1].iov_base = (char *)req + 4;
 
-       rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, server,
-                            CIFS_ECHO_OP);
+       rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, NULL,
+                            server, CIFS_ECHO_OP);
        if (rc)
                cifs_dbg(FYI, "Echo request failed: %d\n", rc);
 
@@ -2382,7 +2382,7 @@ smb2_async_readv(struct cifs_readdata *rdata)
        kref_get(&rdata->refcount);
        rc = cifs_call_async(io_parms.tcon->ses->server, &rqst,
                             cifs_readv_receive, smb2_readv_callback,
-                            rdata, flags);
+                            NULL, rdata, flags);
        if (rc) {
                kref_put(&rdata->refcount, cifs_readdata_release);
                cifs_stats_fail_inc(io_parms.tcon, SMB2_READ_HE);
@@ -2593,8 +2593,8 @@ smb2_async_writev(struct cifs_writedata *wdata,
        }
 
        kref_get(&wdata->refcount);
-       rc = cifs_call_async(server, &rqst, NULL, smb2_writev_callback, wdata,
-                            flags);
+       rc = cifs_call_async(server, &rqst, NULL, smb2_writev_callback, NULL,
+                            wdata, flags);
 
        if (rc) {
                kref_put(&wdata->refcount, release);

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 5283608a8e53e58f474097b563e2b36e92b7c6d7..24ab6fd2c01a8d5eba072bfe01b999764c439246 100644 (file)
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -562,8 +562,8 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst)
  */
 int
 cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
-               mid_receive_t *receive, mid_callback_t *callback, void *cbdata,
-               const int flags)
+               mid_receive_t *receive, mid_callback_t *callback,
+               mid_handle_t *handle, void *cbdata, const int flags)
 {
        int rc, timeout, optype;
        struct mid_q_entry *mid;
@@ -590,6 +590,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
        mid->receive = receive;
        mid->callback = callback;
        mid->callback_data = cbdata;
+       mid->handle = handle;
        mid->mid_state = MID_REQUEST_SUBMITTED;
 
        /* put it on the pending_mid_q */