diff options
-rw-r--r-- | fs/cifs/cifsglob.h | 3 | ||||
-rw-r--r-- | fs/cifs/cifsproto.h | 2 | ||||
-rw-r--r-- | fs/cifs/smb1ops.c | 1 | ||||
-rw-r--r-- | fs/cifs/transport.c | 4 |
4 files changed, 8 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 340dce0ed07b..5e4d1c56767d 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -173,6 +173,9 @@ struct smb_version_operations { | |||
173 | /* setup request: allocate mid, sign message */ | 173 | /* setup request: allocate mid, sign message */ |
174 | int (*setup_request)(struct cifs_ses *, struct kvec *, unsigned int, | 174 | int (*setup_request)(struct cifs_ses *, struct kvec *, unsigned int, |
175 | struct mid_q_entry **); | 175 | struct mid_q_entry **); |
176 | /* setup async request: allocate mid, sign message */ | ||
177 | int (*setup_async_request)(struct TCP_Server_Info *, struct kvec *, | ||
178 | unsigned int, struct mid_q_entry **); | ||
176 | /* check response: verify signature, map error */ | 179 | /* check response: verify signature, map error */ |
177 | int (*check_receive)(struct mid_q_entry *, struct TCP_Server_Info *, | 180 | int (*check_receive)(struct mid_q_entry *, struct TCP_Server_Info *, |
178 | bool); | 181 | bool); |
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 334b867a81ff..cf7fb185103c 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -78,6 +78,8 @@ extern int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, | |||
78 | char *in_buf, int flags); | 78 | char *in_buf, int flags); |
79 | extern int cifs_setup_request(struct cifs_ses *, struct kvec *, unsigned int, | 79 | extern int cifs_setup_request(struct cifs_ses *, struct kvec *, unsigned int, |
80 | struct mid_q_entry **); | 80 | struct mid_q_entry **); |
81 | extern int cifs_setup_async_request(struct TCP_Server_Info *, struct kvec *, | ||
82 | unsigned int, struct mid_q_entry **); | ||
81 | extern int cifs_check_receive(struct mid_q_entry *mid, | 83 | extern int cifs_check_receive(struct mid_q_entry *mid, |
82 | struct TCP_Server_Info *server, bool log_error); | 84 | struct TCP_Server_Info *server, bool log_error); |
83 | extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, | 85 | extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, |
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index 7195fadf1cfa..7bd4973591de 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c | |||
@@ -524,6 +524,7 @@ struct smb_version_operations smb1_operations = { | |||
524 | .send_cancel = send_nt_cancel, | 524 | .send_cancel = send_nt_cancel, |
525 | .compare_fids = cifs_compare_fids, | 525 | .compare_fids = cifs_compare_fids, |
526 | .setup_request = cifs_setup_request, | 526 | .setup_request = cifs_setup_request, |
527 | .setup_async_request = cifs_setup_async_request, | ||
527 | .check_receive = cifs_check_receive, | 528 | .check_receive = cifs_check_receive, |
528 | .add_credits = cifs_add_credits, | 529 | .add_credits = cifs_add_credits, |
529 | .set_credits = cifs_set_credits, | 530 | .set_credits = cifs_set_credits, |
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index bcc02b476f6e..83867ef348df 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
@@ -345,7 +345,7 @@ wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ) | |||
345 | return 0; | 345 | return 0; |
346 | } | 346 | } |
347 | 347 | ||
348 | static int | 348 | int |
349 | cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov, | 349 | cifs_setup_async_request(struct TCP_Server_Info *server, struct kvec *iov, |
350 | unsigned int nvec, struct mid_q_entry **ret_mid) | 350 | unsigned int nvec, struct mid_q_entry **ret_mid) |
351 | { | 351 | { |
@@ -391,7 +391,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, | |||
391 | return rc; | 391 | return rc; |
392 | 392 | ||
393 | mutex_lock(&server->srv_mutex); | 393 | mutex_lock(&server->srv_mutex); |
394 | rc = cifs_setup_async_request(server, iov, nvec, &mid); | 394 | rc = server->ops->setup_async_request(server, iov, nvec, &mid); |
395 | if (rc) { | 395 | if (rc) { |
396 | mutex_unlock(&server->srv_mutex); | 396 | mutex_unlock(&server->srv_mutex); |
397 | add_credits(server, 1, optype); | 397 | add_credits(server, 1, optype); |