diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-09-18 19:20:35 -0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-09-24 22:46:31 -0400 |
| commit | fec344e3f31aa911297cd3a4639432d983b1f324 (patch) | |
| tree | c46deb8e54d4a1f00be47f7d34e572730b0df988 /fs/cifs/cifsproto.h | |
| parent | fb308a6f22f7f4f3574dab6b36c4a3598e50cf05 (diff) | |
cifs: change cifs_call_async to use smb_rqst structs
For now, none of the callers populate rq_pages. That will be done for
writes in a later patch. While we're at it, change the prototype of
setup_async_request not to need a return pointer argument. Just
return the pointer to the mid_q_entry or an ERR_PTR.
Reviewed-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifsproto.h')
| -rw-r--r-- | fs/cifs/cifsproto.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index e97a1843ab98..3b628f2af258 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
| @@ -70,20 +70,20 @@ extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer, | |||
| 70 | extern void DeleteMidQEntry(struct mid_q_entry *midEntry); | 70 | extern void DeleteMidQEntry(struct mid_q_entry *midEntry); |
| 71 | extern void cifs_delete_mid(struct mid_q_entry *mid); | 71 | extern void cifs_delete_mid(struct mid_q_entry *mid); |
| 72 | extern void cifs_wake_up_task(struct mid_q_entry *mid); | 72 | extern void cifs_wake_up_task(struct mid_q_entry *mid); |
| 73 | extern int cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov, | 73 | extern int cifs_call_async(struct TCP_Server_Info *server, |
| 74 | unsigned int nvec, mid_receive_t *receive, | 74 | struct smb_rqst *rqst, |
| 75 | mid_callback_t *callback, void *cbdata, | 75 | mid_receive_t *receive, mid_callback_t *callback, |
| 76 | const int flags); | 76 | void *cbdata, const int flags); |
| 77 | extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *, | 77 | extern int SendReceive(const unsigned int /* xid */ , struct cifs_ses *, |
| 78 | struct smb_hdr * /* input */ , | 78 | struct smb_hdr * /* input */ , |
| 79 | struct smb_hdr * /* out */ , | 79 | struct smb_hdr * /* out */ , |
| 80 | int * /* bytes returned */ , const int); | 80 | int * /* bytes returned */ , const int); |
| 81 | extern int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, | 81 | extern int SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, |
| 82 | char *in_buf, int flags); | 82 | char *in_buf, int flags); |
| 83 | extern int cifs_setup_request(struct cifs_ses *, struct kvec *, unsigned int, | 83 | extern struct mid_q_entry *cifs_setup_request(struct cifs_ses *, |
| 84 | struct mid_q_entry **); | 84 | struct smb_rqst *); |
| 85 | extern int cifs_setup_async_request(struct TCP_Server_Info *, struct kvec *, | 85 | extern struct mid_q_entry *cifs_setup_async_request(struct TCP_Server_Info *, |
| 86 | unsigned int, struct mid_q_entry **); | 86 | struct smb_rqst *); |
| 87 | extern int cifs_check_receive(struct mid_q_entry *mid, | 87 | extern int cifs_check_receive(struct mid_q_entry *mid, |
| 88 | struct TCP_Server_Info *server, bool log_error); | 88 | struct TCP_Server_Info *server, bool log_error); |
| 89 | extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, | 89 | extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, |