diff options
| -rw-r--r-- | source3/include/async_smb.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/async_smb.c | 10 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clioplock.c | 3 |
4 files changed, 3 insertions, 14 deletions
diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index 30c71a243e..869d33226e 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -34,8 +34,6 @@ NTSTATUS cli_smb_req_send(struct tevent_req *req); size_t cli_smb_wct_ofs(struct tevent_req **reqs, int num_reqs); NTSTATUS cli_smb_chain_send(struct tevent_req **reqs, int num_reqs); bool cli_has_async_calls(struct cli_state *cli); -void cli_smb_req_unset_pending(struct tevent_req *req); -bool cli_smb_req_set_pending(struct tevent_req *req); uint16_t cli_smb_req_mid(struct tevent_req *req); void cli_smb_req_set_mid(struct tevent_req *req, uint16_t mid); uint32_t cli_smb_req_seqnum(struct tevent_req *req); diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 721ac9bfe4..8ca19111bf 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -23,16 +23,6 @@ #include "async_smb.h" #include "../libcli/smb/smbXcli_base.h" -void cli_smb_req_unset_pending(struct tevent_req *req) -{ - smbXcli_req_unset_pending(req); -} - -bool cli_smb_req_set_pending(struct tevent_req *req) -{ - return smbXcli_req_set_pending(req); -} - /* * Fetch a smb request's mid. Only valid after the request has been sent by * cli_smb_req_send(). diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 75948b8e99..561a47f3f3 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -582,7 +582,7 @@ static void cli_echo_done(struct tevent_req *subreq) return; } - if (!cli_smb_req_set_pending(subreq)) { + if (!smbXcli_req_set_pending(subreq)) { tevent_req_nterror(req, NT_STATUS_NO_MEMORY); return; } diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c index a708453877..e6c20e44e7 100644 --- a/source3/libsmb/clioplock.c +++ b/source3/libsmb/clioplock.c @@ -21,6 +21,7 @@ #include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" #include "libsmb/libsmb.h" +#include "../libcli/smb/smbXcli_base.h" struct cli_smb_oplock_break_waiter_state { uint16_t fnum; @@ -52,7 +53,7 @@ struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx, } cli_smb_req_set_mid(subreq, 0xffff); - if (!cli_smb_req_set_pending(subreq)) { + if (!smbXcli_req_set_pending(subreq)) { tevent_req_nterror(req, NT_STATUS_NO_MEMORY); return tevent_req_post(req, ev); } |