diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-11 16:28:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:30 -0500 |
| commit | 921fbb25eb4a6097a1e960abadc4dc4b11d32cf6 (patch) | |
| tree | bb264bb4be703daea814ee143cb19a031bac93e4 /source3/smbd/reply.c | |
| parent | ef6c3a3c7a62188112561781449f05e25ccee58e (diff) | |
| download | samba-921fbb25eb4a6097a1e960abadc4dc4b11d32cf6.tar.gz samba-921fbb25eb4a6097a1e960abadc4dc4b11d32cf6.tar.bz2 samba-921fbb25eb4a6097a1e960abadc4dc4b11d32cf6.zip | |
r24332: schedule_aio_read_and_X does not need InBuf/OutBuf
(This used to be commit 9ad91bd20592850d7b6393e1ac7f0e0919d69668)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 7b981e1c8a..a62b54550e 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2960,22 +2960,21 @@ void reply_read_and_X(connection_struct *conn, struct smb_request *req) return; } - if (!reply_prep_legacy(req, &inbuf, &outbuf, &length, &bufsize)) { - reply_nterror(req, NT_STATUS_NO_MEMORY); + if (!big_readX + && schedule_aio_read_and_X(conn, req, fsp, startpos, smb_maxcnt)) { END_PROFILE(SMBreadX); + reply_post_legacy(req, -1); return; } - set_message(inbuf,outbuf,12,0,True); - - if (!big_readX - && schedule_aio_read_and_X(conn, inbuf, outbuf, length, bufsize, - fsp, startpos, smb_maxcnt)) { + if (!reply_prep_legacy(req, &inbuf, &outbuf, &length, &bufsize)) { + reply_nterror(req, NT_STATUS_NO_MEMORY); END_PROFILE(SMBreadX); - reply_post_legacy(req, -1); return; } + set_message(inbuf,outbuf,12,0,True); + nread = send_file_readX(conn, inbuf, outbuf, length, bufsize, fsp, startpos, smb_maxcnt); /* Only call chain_reply if not an error. */ |