fix error code for read on a directory

[kai/samba.git] / source4 / ntvfs / posix / pvfs_read.c

diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c
index 411fbd9c27c63bbe12e762283d2f477e52bc9828..8e1a59473f2f08cd5c57deff3ef9c3b0e1cb96c0 100644 (file)
--- a/source4/ntvfs/posix/pvfs_read.c
+++ b/source4/ntvfs/posix/pvfs_read.c
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,13 +16,12 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/security.h"
+#include "lib/events/events.h"
 
 /*
   read from a file
@@ -41,13 +40,13 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
                return ntvfs_map_read(ntvfs, req, rd);
        }
 
-       f = pvfs_find_fd(pvfs, req, rd->readx.in.file.fnum);
+       f = pvfs_find_fd(pvfs, req, rd->readx.in.file.ntvfs);
        if (!f) {
                return NT_STATUS_INVALID_HANDLE;
        }
 
        if (f->handle->fd == -1) {
-               return NT_STATUS_FILE_IS_A_DIRECTORY;
+               return NT_STATUS_INVALID_DEVICE_REQUEST;
        }
 
        mask = SEC_FILE_READ_DATA;
@@ -59,7 +58,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
        }
 
        maxcnt = rd->readx.in.maxcnt;
-       if (maxcnt > UINT16_MAX) {
+       if (maxcnt > UINT16_MAX && req->ctx->protocol < PROTOCOL_SMB2) {
                maxcnt = 0;
        }
 
@@ -75,6 +74,16 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
                ret = pvfs_stream_read(pvfs, f->handle, 
                                       rd->readx.out.data, maxcnt, rd->readx.in.offset);
        } else {
+#if HAVE_LINUX_AIO
+               /* possibly try an aio read */
+               if ((req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC) &&
+                   (pvfs->flags & PVFS_FLAG_LINUX_AIO)) {
+                       status = pvfs_aio_pread(req, rd, f, maxcnt);
+                       if (NT_STATUS_IS_OK(status)) {
+                               return NT_STATUS_OK;
+                       }
+               }
+#endif
                ret = pread(f->handle->fd, 
                            rd->readx.out.data, 
                            maxcnt,
@@ -84,6 +93,14 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
                return pvfs_map_errno(pvfs, errno);
        }
 
+       /* only SMB2 honors mincnt */
+       if (req->ctx->protocol == PROTOCOL_SMB2) {
+               if (rd->readx.in.mincnt > ret ||
+                   (ret == 0 && maxcnt > 0)) {
+                       return NT_STATUS_END_OF_FILE;
+               }
+       }
+
        f->handle->position = f->handle->seek_offset = rd->readx.in.offset + ret;
 
        rd->readx.out.nread = ret;