diff options
author | Pavel Shilovsky <piastry@etersoft.ru> | 2012-05-17 04:18:21 -0400 |
---|---|---|
committer | Pavel Shilovsky <pshilovsky@samba.org> | 2012-05-23 04:32:57 -0400 |
commit | 082d0642c61fc309ca7f6133968ba1264193dcc1 (patch) | |
tree | 4a41e9ff5f3effd2672811b445ee231c32b08c36 /fs/cifs/transport.c | |
parent | 2608bee744a92d60d15ff4e6e0b913d8b406aedd (diff) |
CIFS: Move protocol specific part from SendReceive2 to ops struct
Acked-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/transport.c')
-rw-r--r-- | fs/cifs/transport.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 269a5a7e0030..87bd998cfbec 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c | |||
@@ -514,7 +514,7 @@ cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server, | |||
514 | return map_smb_to_linux_error(mid->resp_buf, log_error); | 514 | return map_smb_to_linux_error(mid->resp_buf, log_error); |
515 | } | 515 | } |
516 | 516 | ||
517 | static int | 517 | int |
518 | cifs_setup_request(struct cifs_ses *ses, struct kvec *iov, | 518 | cifs_setup_request(struct cifs_ses *ses, struct kvec *iov, |
519 | unsigned int nvec, struct mid_q_entry **ret_mid) | 519 | unsigned int nvec, struct mid_q_entry **ret_mid) |
520 | { | 520 | { |
@@ -577,7 +577,7 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, | |||
577 | 577 | ||
578 | mutex_lock(&ses->server->srv_mutex); | 578 | mutex_lock(&ses->server->srv_mutex); |
579 | 579 | ||
580 | rc = cifs_setup_request(ses, iov, n_vec, &midQ); | 580 | rc = ses->server->ops->setup_request(ses, iov, n_vec, &midQ); |
581 | if (rc) { | 581 | if (rc) { |
582 | mutex_unlock(&ses->server->srv_mutex); | 582 | mutex_unlock(&ses->server->srv_mutex); |
583 | cifs_small_buf_release(buf); | 583 | cifs_small_buf_release(buf); |
@@ -640,7 +640,8 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, | |||
640 | else | 640 | else |
641 | *pRespBufType = CIFS_SMALL_BUFFER; | 641 | *pRespBufType = CIFS_SMALL_BUFFER; |
642 | 642 | ||
643 | rc = cifs_check_receive(midQ, ses->server, flags & CIFS_LOG_ERROR); | 643 | rc = ses->server->ops->check_receive(midQ, ses->server, |
644 | flags & CIFS_LOG_ERROR); | ||
644 | 645 | ||
645 | /* mark it so buf will not be freed by delete_mid */ | 646 | /* mark it so buf will not be freed by delete_mid */ |
646 | if ((flags & CIFS_NO_RESP) == 0) | 647 | if ((flags & CIFS_NO_RESP) == 0) |