diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-01-31 16:08:57 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-01-31 16:08:57 +0300 |
| commit | 4259d115478750d7b38cd6c2f20777b27f017e69 (patch) | |
| tree | 289563bcfe29c2892c1b77aa95292530b7e3c69a /source3/smbd/reply.c | |
| parent | 2763b90d242119d25d9f5afa91a403e85425da06 (diff) | |
| parent | 09454362cf75ecb7db58560604b567611e89d5ef (diff) | |
| download | samba-4259d115478750d7b38cd6c2f20777b27f017e69.tar.gz samba-4259d115478750d7b38cd6c2f20777b27f017e69.tar.xz samba-4259d115478750d7b38cd6c2f20777b27f017e69.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit d46fc35dd4e22ecd777800a8cdb6c31763d0fac4)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 4ea81a3819..18376031ec 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3338,11 +3338,7 @@ void reply_read_and_X(struct smb_request *req) return; } - /* It is possible for VFS modules to selectively decide whether Async I/O should be used - for the file or not. - */ - if ((SMB_VFS_AIO_FORCE(fsp)) && - !big_readX && + if (!big_readX && schedule_aio_read_and_X(conn, req, fsp, startpos, smb_maxcnt)) { END_PROFILE(SMBreadX); return; @@ -4012,10 +4008,7 @@ void reply_write_and_X(struct smb_request *req) nwritten = 0; } else { - /* It is possible for VFS modules to selectively decide whether Async I/O - should be used for the file or not. - */ - if ((SMB_VFS_AIO_FORCE(fsp)) && (req->unread_bytes == 0) && + if ((req->unread_bytes == 0) && schedule_aio_write_and_X(conn, req, fsp, data, startpos, numtowrite)) { END_PROFILE(SMBwriteX); |