diff options
| author | Jeremy Allison <jra@samba.org> | 2010-12-14 16:32:10 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-12-15 01:38:16 +0100 |
| commit | 14c70346fc88d05dfabc14b0a932632470fee6fe (patch) | |
| tree | d1382cdcb7bf0cb0804a7f374b92044b30cc9a83 /source3/smbd/aio.c | |
| parent | 3bc1cf94e3a0febe8d3d53229aa49c3d8eb8c1b6 (diff) | |
| download | samba-14c70346fc88d05dfabc14b0a932632470fee6fe.tar.gz samba-14c70346fc88d05dfabc14b0a932632470fee6fe.tar.bz2 samba-14c70346fc88d05dfabc14b0a932632470fee6fe.zip | |
Change interface of schedule_smb2_aio_read() to allocate the return DATA_BLOB.
Change smb2_read code to allocate return DATA_BLOB just before the read.
Preparing for SMB2 sendfile change which will not need to allocate
return buffer.
Jeremy
Diffstat (limited to 'source3/smbd/aio.c')
| -rw-r--r-- | source3/smbd/aio.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c index 7a23d37918..eb8ed6799f 100644 --- a/source3/smbd/aio.c +++ b/source3/smbd/aio.c @@ -385,7 +385,8 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn, NTSTATUS schedule_smb2_aio_read(connection_struct *conn, struct smb_request *smbreq, files_struct *fsp, - char *inbuf, + TALLOC_CTX *ctx, + DATA_BLOB *preadbuf, SMB_OFF_T startpos, size_t smb_maxcnt) { @@ -427,6 +428,12 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn, return NT_STATUS_RETRY; } + /* Create the out buffer. */ + *preadbuf = data_blob_talloc(ctx, NULL, smb_maxcnt); + if (preadbuf->data == NULL) { + return NT_STATUS_NO_MEMORY; + } + if (!(aio_ex = create_aio_extra(smbreq->smb2req, fsp, 0))) { return NT_STATUS_NO_MEMORY; } @@ -447,7 +454,7 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn, /* Now set up the aio record for the read call. */ a->aio_fildes = fsp->fh->fd; - a->aio_buf = inbuf; + a->aio_buf = preadbuf->data; a->aio_nbytes = smb_maxcnt; a->aio_offset = startpos; a->aio_sigevent.sigev_notify = SIGEV_SIGNAL; @@ -1031,7 +1038,8 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn, NTSTATUS schedule_smb2_aio_read(connection_struct *conn, struct smb_request *smbreq, files_struct *fsp, - char *inbuf, + TALLOC_CTX *ctx, + DATA_BLOB *preadbuf, SMB_OFF_T startpos, size_t smb_maxcnt) { |