CIFS: Add mid handle callback
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>
This commit is contained in:
committed by
Steve French
parent
9bb17e0916
commit
9b7c18a2d4
@@ -1312,6 +1312,13 @@ typedef int (mid_receive_t)(struct TCP_Server_Info *server,
|
|||||||
*/
|
*/
|
||||||
typedef void (mid_callback_t)(struct mid_q_entry *mid);
|
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 */
|
/* one of these for every pending CIFS request to the server */
|
||||||
struct mid_q_entry {
|
struct mid_q_entry {
|
||||||
struct list_head qhead; /* mids waiting on reply from this server */
|
struct list_head qhead; /* mids waiting on reply from this server */
|
||||||
@@ -1326,6 +1333,7 @@ struct mid_q_entry {
|
|||||||
#endif
|
#endif
|
||||||
mid_receive_t *receive; /* call receive callback */
|
mid_receive_t *receive; /* call receive callback */
|
||||||
mid_callback_t *callback; /* call completion 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 *callback_data; /* general purpose pointer for callback */
|
||||||
void *resp_buf; /* pointer to received SMB header */
|
void *resp_buf; /* pointer to received SMB header */
|
||||||
int mid_state; /* wish this were enum but can not pass to wait_event */
|
int mid_state; /* wish this were enum but can not pass to wait_event */
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ extern void cifs_wake_up_task(struct mid_q_entry *mid);
|
|||||||
extern int cifs_call_async(struct TCP_Server_Info *server,
|
extern int cifs_call_async(struct TCP_Server_Info *server,
|
||||||
struct smb_rqst *rqst,
|
struct smb_rqst *rqst,
|
||||||
mid_receive_t *receive, mid_callback_t *callback,
|
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,
|
extern int cifs_send_recv(const unsigned int xid, struct cifs_ses *ses,
|
||||||
struct smb_rqst *rqst, int *resp_buf_type,
|
struct smb_rqst *rqst, int *resp_buf_type,
|
||||||
const int flags, struct kvec *resp_iov);
|
const int flags, struct kvec *resp_iov);
|
||||||
|
|||||||
@@ -731,7 +731,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server)
|
|||||||
iov[1].iov_len = get_rfc1002_length(smb);
|
iov[1].iov_len = get_rfc1002_length(smb);
|
||||||
iov[1].iov_base = (char *)smb + 4;
|
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);
|
server, CIFS_ASYNC_OP | CIFS_ECHO_OP);
|
||||||
if (rc)
|
if (rc)
|
||||||
cifs_dbg(FYI, "Echo request failed: %d\n", rc);
|
cifs_dbg(FYI, "Echo request failed: %d\n", rc);
|
||||||
@@ -1654,7 +1654,7 @@ cifs_async_readv(struct cifs_readdata *rdata)
|
|||||||
|
|
||||||
kref_get(&rdata->refcount);
|
kref_get(&rdata->refcount);
|
||||||
rc = cifs_call_async(tcon->ses->server, &rqst, cifs_readv_receive,
|
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)
|
if (rc == 0)
|
||||||
cifs_stats_inc(&tcon->stats.cifs_stats.num_reads);
|
cifs_stats_inc(&tcon->stats.cifs_stats.num_reads);
|
||||||
@@ -2168,7 +2168,7 @@ cifs_async_writev(struct cifs_writedata *wdata,
|
|||||||
|
|
||||||
kref_get(&wdata->refcount);
|
kref_get(&wdata->refcount);
|
||||||
rc = cifs_call_async(tcon->ses->server, &rqst, NULL,
|
rc = cifs_call_async(tcon->ses->server, &rqst, NULL,
|
||||||
cifs_writev_callback, wdata, 0);
|
cifs_writev_callback, NULL, wdata, 0);
|
||||||
|
|
||||||
if (rc == 0)
|
if (rc == 0)
|
||||||
cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);
|
cifs_stats_inc(&tcon->stats.cifs_stats.num_writes);
|
||||||
|
|||||||
@@ -2144,8 +2144,8 @@ SMB2_echo(struct TCP_Server_Info *server)
|
|||||||
iov[1].iov_len = get_rfc1002_length(req);
|
iov[1].iov_len = get_rfc1002_length(req);
|
||||||
iov[1].iov_base = (char *)req + 4;
|
iov[1].iov_base = (char *)req + 4;
|
||||||
|
|
||||||
rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, server,
|
rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, NULL,
|
||||||
CIFS_ECHO_OP);
|
server, CIFS_ECHO_OP);
|
||||||
if (rc)
|
if (rc)
|
||||||
cifs_dbg(FYI, "Echo request failed: %d\n", rc);
|
cifs_dbg(FYI, "Echo request failed: %d\n", rc);
|
||||||
|
|
||||||
@@ -2384,7 +2384,7 @@ smb2_async_readv(struct cifs_readdata *rdata)
|
|||||||
kref_get(&rdata->refcount);
|
kref_get(&rdata->refcount);
|
||||||
rc = cifs_call_async(io_parms.tcon->ses->server, &rqst,
|
rc = cifs_call_async(io_parms.tcon->ses->server, &rqst,
|
||||||
cifs_readv_receive, smb2_readv_callback,
|
cifs_readv_receive, smb2_readv_callback,
|
||||||
rdata, flags);
|
NULL, rdata, flags);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
kref_put(&rdata->refcount, cifs_readdata_release);
|
kref_put(&rdata->refcount, cifs_readdata_release);
|
||||||
cifs_stats_fail_inc(io_parms.tcon, SMB2_READ_HE);
|
cifs_stats_fail_inc(io_parms.tcon, SMB2_READ_HE);
|
||||||
@@ -2595,8 +2595,8 @@ smb2_async_writev(struct cifs_writedata *wdata,
|
|||||||
}
|
}
|
||||||
|
|
||||||
kref_get(&wdata->refcount);
|
kref_get(&wdata->refcount);
|
||||||
rc = cifs_call_async(server, &rqst, NULL, smb2_writev_callback, wdata,
|
rc = cifs_call_async(server, &rqst, NULL, smb2_writev_callback, NULL,
|
||||||
flags);
|
wdata, flags);
|
||||||
|
|
||||||
if (rc) {
|
if (rc) {
|
||||||
kref_put(&wdata->refcount, release);
|
kref_put(&wdata->refcount, release);
|
||||||
|
|||||||
@@ -504,8 +504,8 @@ cifs_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst)
|
|||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
|
cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
|
||||||
mid_receive_t *receive, mid_callback_t *callback, void *cbdata,
|
mid_receive_t *receive, mid_callback_t *callback,
|
||||||
const int flags)
|
mid_handle_t *handle, void *cbdata, const int flags)
|
||||||
{
|
{
|
||||||
int rc, timeout, optype;
|
int rc, timeout, optype;
|
||||||
struct mid_q_entry *mid;
|
struct mid_q_entry *mid;
|
||||||
@@ -532,6 +532,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
|
|||||||
mid->receive = receive;
|
mid->receive = receive;
|
||||||
mid->callback = callback;
|
mid->callback = callback;
|
||||||
mid->callback_data = cbdata;
|
mid->callback_data = cbdata;
|
||||||
|
mid->handle = handle;
|
||||||
mid->mid_state = MID_REQUEST_SUBMITTED;
|
mid->mid_state = MID_REQUEST_SUBMITTED;
|
||||||
|
|
||||||
/* put it on the pending_mid_q */
|
/* put it on the pending_mid_q */
|
||||||
|
|||||||
Reference in New Issue
Block a user