s3-talloc Change TALLOC_P() to talloc()

[nivanova/samba-autobuild/.git] / source3 / smbd / smb2_read.c

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index d5f6896f645d2469f3f88e71bb4c210a74804137..6e686ef2738c174beaf19eb0681e14c47e3687f7 100644 (file)
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -19,9 +19,13 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "libcli/security/security.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "rpc_server/srv_pipe_hnd.h"
 
 static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
@@ -304,7 +308,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req,
        /* Make a copy of state attached to the smb2req. Attach
           the destructor here as this will trigger the sendfile
           call when the request is destroyed. */
-       state_copy = TALLOC_P(smb2req, struct smbd_smb2_read_state);
+       state_copy = talloc(smb2req, struct smbd_smb2_read_state);
        if (!state_copy) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -440,7 +444,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                        return tevent_req_post(req, ev);
                }
 
-               subreq = np_read_send(state, smbd_event_context(),
+               subreq = np_read_send(state, server_event_context(),
                                      fsp->fake_file_handle,
                                      state->out_data.data,
                                      state->out_data.length);