summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-03-18 12:00:25 -0700
committerJeremy Allison <jra@samba.org>2013-04-19 14:10:14 -0700
commit9791c1a24822d8b46bf7dd231b615d281b58540b (patch)
tree3b8da2738ab56e883d70e863aad567fd8e95bd1d /source3
parent8543a7b9b3b1efe2911b32c5f7c1cd3db85681b1 (diff)
downloadsamba-9791c1a24822d8b46bf7dd231b615d281b58540b.tar.gz
samba-9791c1a24822d8b46bf7dd231b615d281b58540b.tar.bz2
samba-9791c1a24822d8b46bf7dd231b615d281b58540b.zip
Ensure we don't do an SMB2 aio write if RECVFILE is active.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Stefan (metze) Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/aio.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index 3f553ebcfb..e8be408eaa 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -861,6 +861,11 @@ NTSTATUS schedule_aio_smb2_write(connection_struct *conn,
return NT_STATUS_RETRY;
}
+ if (smbreq->unread_bytes) {
+ /* Can't do async with recvfile. */
+ return NT_STATUS_RETRY;
+ }
+
if (!(aio_ex = create_aio_extra(smbreq->smb2req, fsp, 0))) {
return NT_STATUS_NO_MEMORY;
}