diff options
| author | Steve French <smfrench@gmail.com> | 2011-10-19 21:22:41 -0500 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2011-10-19 21:22:41 -0500 |
| commit | fbcae3ea169189ee49dc6820478cb1d069b80a08 (patch) | |
| tree | 5e5b35c3bc9c11082697c4190ff96c6a4291ef16 /fs/cifs/transport.c | |
| parent | 71c424bac5679200e272357a225639da8bf94068 (diff) | |
| parent | f06ac72e929115f2772c29727152ba0832d641e4 (diff) | |
Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 33a3fbf3a3a5..0cc9584f5889 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -26,6 +26,7 @@ #include <linux/wait.h> #include <linux/net.h> #include <linux/delay.h> +#include <linux/freezer.h> #include <asm/uaccess.h> #include <asm/processor.h> #include <linux/mempool.h> @@ -324,7 +325,7 @@ wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ) { int error; - error = wait_event_killable(server->response_q, + error = wait_event_freezekillable(server->response_q, midQ->midState != MID_REQUEST_SUBMITTED); if (error < 0) return -ERESTARTSYS; @@ -339,8 +340,8 @@ wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ) */ int cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, - unsigned int nvec, mid_callback_t *callback, void *cbdata, - bool ignore_pend) + unsigned int nvec, mid_receive_t *receive, + mid_callback_t *callback, void *cbdata, bool ignore_pend) { int rc; struct mid_q_entry *mid; @@ -374,6 +375,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, goto out_err; } + mid->receive = receive; mid->callback = callback; mid->callback_data = cbdata; mid->midState = MID_REQUEST_SUBMITTED; |