r14173: change smb interface structures to always use
[gd/samba-autobuild/.git] / source4 / ntvfs / ntvfs_generic.c
index 29f21b18633020ca27401a1c4363d431de1d8cca..e373c7a28ec41a9342c9fcf78d95a93d96877ad4 100644 (file)
@@ -3,7 +3,7 @@
 
    NTVFS generic level mapping code
 
-   Copyright (C) Andrew Tridgell 2003
+   Copyright (C) Andrew Tridgell 2003-2004
 
    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
 */
 
 #include "includes.h"
+#include "smb_server/smb_server.h"
+#include "librpc/gen_ndr/ndr_security.h"
+#include "ntvfs/ntvfs.h"
+
+/* a second stage function converts from the out parameters of the generic
+   call onto the out parameters of the specific call made */
+typedef NTSTATUS (*second_stage_t)(struct ntvfs_module_context *,
+                                  struct ntvfs_request *,
+                                  void *, void *, NTSTATUS);
+
+/* 
+   this structure holds the async state for pending mapped async calls
+*/
+struct ntvfs_map_async {
+       struct ntvfs_module_context *ntvfs;
+       void *io, *io2;
+       second_stage_t fn;
+};
+
+/*
+  this is a async wrapper, called from the backend when it has completed
+  a function that it has decided to reply to in an async fashion
+*/
+static void ntvfs_map_async_send(struct ntvfs_request *req)
+{
+       struct ntvfs_map_async *m = req->async_states->private_data;
+
+       ntvfs_async_state_pop(req);
+
+       /* call the _finish function setup in ntvfs_map_async_setup() */
+       req->async_states->status = m->fn(m->ntvfs, req, m->io, m->io2, req->async_states->status);
+
+       /* call the send function from the next module up */
+       req->async_states->send_fn(req);
+}
 
 /*
-  see if a filename ends in EXE COM DLL or SYM. This is needed for the DENY_DOS mapping for OpenX
+  prepare for calling a ntvfs backend with async support
+  io is the original call structure
+  io2 is the new call structure for the mapped call
+  fn is a second stage function for processing the out arguments
 */
-static BOOL is_exe_file(const char *fname)
+static NTSTATUS ntvfs_map_async_setup(struct ntvfs_module_context *ntvfs,
+                                     struct ntvfs_request *req,
+                                     void *io, void *io2,
+                                     second_stage_t fn)
+{
+       struct ntvfs_map_async *m;
+       m = talloc(req, struct ntvfs_map_async);
+       if (m == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       m->ntvfs = ntvfs;
+       m->io = io;
+       m->io2 = io2;
+       m->fn = fn;
+       return ntvfs_async_state_push(ntvfs, req, m, ntvfs_map_async_send);
+}
+
+/*
+  called when first stage processing is complete. 
+*/     
+static NTSTATUS ntvfs_map_async_finish(struct ntvfs_request *req, NTSTATUS status)
+{
+       struct ntvfs_map_async *m;
+
+       /* if the backend has decided to reply in an async fashion then
+          we don't need to do any work here */
+       if (req->async_states->state & NTVFS_ASYNC_STATE_ASYNC) {
+               return status;
+       }
+
+       /* the backend is replying immediately. call the 2nd stage function after popping our local
+          async state */
+       m = req->async_states->private_data;
+
+       ntvfs_async_state_pop(req);
+
+       return m->fn(m->ntvfs, req, m->io, m->io2, status);
+}
+
+/*
+  see if a filename ends in EXE COM DLL or SYM. This is needed for the
+  DENY_DOS mapping for OpenX
+*/
+BOOL is_exe_filename(const char *fname)
 {
        char *p;
        p = strrchr(fname, '.');
@@ -55,213 +136,376 @@ static BOOL is_exe_file(const char *fname)
 
 
 /* 
-   NTVFS open generic to any mapper
+   NTVFS openx to ntcreatex mapper
 */
-NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io)
+static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
+                                     struct ntvfs_request *req, 
+                                     union smb_open *io, 
+                                     union smb_open *io2, 
+                                     NTSTATUS status)
 {
-       NTSTATUS status;
-       union smb_open io2;
+       time_t write_time = 0;
+       uint32_t set_size = 0;
+       union smb_setfileinfo *sf;
+       uint_t state;
 
-       if (io->generic.level == RAW_OPEN_GENERIC) {
-               return NT_STATUS_INVALID_LEVEL;
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
        switch (io->generic.level) {
+       case RAW_OPEN_OPEN:
+               io->openold.file.fnum      = io2->generic.file.fnum;
+               io->openold.out.attrib     = io2->generic.out.attrib;
+               io->openold.out.write_time = nt_time_to_unix(io2->generic.out.write_time);
+               io->openold.out.size       = io2->generic.out.size;
+               io->openold.out.rmode      = io->openold.in.open_mode;
+               break;
+
        case RAW_OPEN_OPENX:
-               ZERO_STRUCT(io2.generic.in);
-               io2.generic.level = RAW_OPEN_GENERIC;
-               if (io->openx.in.flags & OPENX_FLAGS_REQUEST_OPLOCK) {
-                       io2.generic.in.flags |= NTCREATEX_FLAGS_REQUEST_OPLOCK;
-               }
-               if (io->openx.in.flags & OPENX_FLAGS_REQUEST_BATCH_OPLOCK) {
-                       io2.generic.in.flags |= NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK;
+               io->openx.file.fnum       = io2->generic.file.fnum;
+               io->openx.out.attrib      = io2->generic.out.attrib;
+               io->openx.out.write_time  = nt_time_to_unix(io2->generic.out.write_time);
+               io->openx.out.size        = io2->generic.out.size;
+               io->openx.out.access      = (io->openx.in.open_mode & OPENX_MODE_ACCESS_MASK);
+               io->openx.out.ftype       = 0;
+               io->openx.out.devstate    = 0;
+               io->openx.out.action      = io2->generic.out.create_action;
+               io->openx.out.unique_fid  = 0;
+               io->openx.out.access_mask = SEC_STD_ALL;
+               io->openx.out.unknown     = 0;
+               
+               /* we need to extend the file to the requested size if
+                  it was newly created */
+               if (io2->generic.out.create_action == NTCREATEX_ACTION_CREATED) {
+                       set_size = io->openx.in.size;
                }
+               break;
 
-               switch (io->openx.in.open_mode & OPENX_MODE_ACCESS_MASK) {
-               case OPENX_MODE_ACCESS_READ:
-                       io2.generic.in.access_mask = GENERIC_RIGHTS_FILE_READ;
-                       break;
-               case OPENX_MODE_ACCESS_WRITE:
-                       io2.generic.in.access_mask = GENERIC_RIGHTS_FILE_WRITE;
-                       break;
-               case OPENX_MODE_ACCESS_RDWR:
-               case OPENX_MODE_ACCESS_FCB:
-                       io2.generic.in.access_mask = GENERIC_RIGHTS_FILE_ALL_ACCESS;
-                       break;
+       case RAW_OPEN_T2OPEN:
+               io->t2open.file.fnum       = io2->generic.file.fnum;
+               io->t2open.out.attrib      = io2->generic.out.attrib;
+               io->t2open.out.write_time  = nt_time_to_unix(io2->generic.out.write_time);
+               io->t2open.out.size        = io2->generic.out.size;
+               io->t2open.out.access      = io->t2open.in.open_mode;
+               io->t2open.out.ftype       = 0;
+               io->t2open.out.devstate    = 0;
+               io->t2open.out.action      = io2->generic.out.create_action;
+               io->t2open.out.file_id      = 0;
+               break;
+
+       case RAW_OPEN_MKNEW:
+       case RAW_OPEN_CREATE:
+               io->mknew.file.fnum = io2->generic.file.fnum;
+               write_time = io->mknew.in.write_time;
+               break;
+
+       case RAW_OPEN_CTEMP:
+               io->ctemp.file.fnum = io2->generic.file.fnum;
+               io->ctemp.out.name  = talloc_strdup(req, io2->generic.in.fname + 
+                                                   strlen(io->ctemp.in.directory) + 1);
+               NT_STATUS_HAVE_NO_MEMORY(io->ctemp.out.name);
+               break;
+
+       default:
+               return NT_STATUS_INVALID_LEVEL;
+       }
+
+       /* doing a secondary request async is more trouble than its
+          worth */
+       state = req->async_states->state;
+       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
+       if (write_time != 0) {
+               sf = talloc(req, union smb_setfileinfo);
+               NT_STATUS_HAVE_NO_MEMORY(sf);
+               sf->generic.level           = RAW_SFILEINFO_STANDARD;
+               sf->generic.file.fnum       = io2->generic.file.fnum;
+               sf->standard.in.create_time = 0;
+               sf->standard.in.write_time  = write_time;
+               sf->standard.in.access_time = 0;
+               status = ntvfs->ops->setfileinfo(ntvfs, req, sf);
+       }
+
+       if (set_size != 0) {
+               sf = talloc(req, union smb_setfileinfo);                        
+               NT_STATUS_HAVE_NO_MEMORY(sf);
+               sf->generic.level            = RAW_SFILEINFO_END_OF_FILE_INFORMATION;
+               sf->generic.file.fnum        = io2->generic.file.fnum;
+               sf->end_of_file_info.in.size = set_size;
+               status = ntvfs->ops->setfileinfo(ntvfs, req, sf);
+               if (NT_STATUS_IS_OK(status)) {
+                       io->openx.out.size = io->openx.in.size;
                }
+       }
 
-               switch (io->openx.in.open_mode & OPENX_MODE_DENY_MASK) {
-               case OPENX_MODE_DENY_READ:
-                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_WRITE;
-                       break;
-               case OPENX_MODE_DENY_WRITE:
-                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ;
-                       break;
-               case OPENX_MODE_DENY_ALL:
-                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
-                       break;
-               case OPENX_MODE_DENY_NONE:
-                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
-                       break;
-               case OPENX_MODE_DENY_DOS:
-                       /* DENY_DOS is quite strange - it depends on the filename! */
-                       if (is_exe_file(io->openx.in.fname)) {
-                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
+       req->async_states->state = state;
+
+       return NT_STATUS_OK;
+}
+
+/*
+  the core of the mapping between openx style parameters and ntcreatex 
+  parameters
+*/
+static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode, 
+                              uint16_t open_func, const char *fname,
+                              union smb_open *io2)
+{
+       if (flags & OPENX_FLAGS_REQUEST_OPLOCK) {
+               io2->generic.in.flags |= NTCREATEX_FLAGS_REQUEST_OPLOCK;
+       }
+       if (flags & OPENX_FLAGS_REQUEST_BATCH_OPLOCK) {
+               io2->generic.in.flags |= NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK;
+       }
+
+       switch (open_mode & OPENX_MODE_ACCESS_MASK) {
+       case OPENX_MODE_ACCESS_READ:
+       case OPENX_MODE_ACCESS_EXEC:
+               io2->generic.in.access_mask = SEC_RIGHTS_FILE_READ;
+               break;
+       case OPENX_MODE_ACCESS_WRITE:
+               io2->generic.in.access_mask = SEC_RIGHTS_FILE_WRITE;
+               break;
+       case OPENX_MODE_ACCESS_RDWR:
+       case OPENX_MODE_ACCESS_FCB:
+               io2->generic.in.access_mask = 
+                       SEC_RIGHTS_FILE_READ | 
+                       SEC_RIGHTS_FILE_WRITE;
+               break;
+       default:
+               return NT_STATUS_DOS(ERRDOS, ERRbadaccess);
+       }
+
+       switch (open_mode & OPENX_MODE_DENY_MASK) {
+       case OPENX_MODE_DENY_READ:
+               io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_WRITE;
+               break;
+       case OPENX_MODE_DENY_WRITE:
+               io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ;
+               break;
+       case OPENX_MODE_DENY_ALL:
+               io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+               break;
+       case OPENX_MODE_DENY_NONE:
+               io2->generic.in.share_access = 
+                       NTCREATEX_SHARE_ACCESS_READ | 
+                       NTCREATEX_SHARE_ACCESS_WRITE;
+               break;
+       case OPENX_MODE_DENY_DOS:
+               /* DENY_DOS is quite strange - it depends on the filename! */
+               io2->generic.in.create_options |= 
+                       NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
+               if (is_exe_filename(fname)) {
+                       io2->generic.in.share_access = 
+                               NTCREATEX_SHARE_ACCESS_READ | 
+                               NTCREATEX_SHARE_ACCESS_WRITE;
+               } else {
+                       if ((open_mode & OPENX_MODE_ACCESS_MASK) == OPENX_MODE_ACCESS_READ) {
+                               io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ;
                        } else {
-                               if ((io->openx.in.open_mode & OPENX_MODE_ACCESS_MASK) == 
-                                   OPENX_MODE_ACCESS_READ) {
-                                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ;
-                               } else {
-                                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
-                               }
+                               io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
                        }
-                       break;
-               case OPENX_MODE_DENY_FCB:
-                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
-                       break;
                }
+               break;
+       case OPENX_MODE_DENY_FCB:
+               io2->generic.in.create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
+               io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+               break;
+       default:
+               return NT_STATUS_DOS(ERRDOS, ERRbadaccess);
+       }
 
-               switch (io->openx.in.open_func) {
-               case (OPENX_OPEN_FUNC_FAIL):
-                       io2.generic.in.open_disposition = NTCREATEX_DISP_CREATE;
+       switch (open_func) {
+       case (OPENX_OPEN_FUNC_OPEN):
+               io2->generic.in.open_disposition = NTCREATEX_DISP_OPEN;
+               break;
+       case (OPENX_OPEN_FUNC_TRUNC):
+               io2->generic.in.open_disposition = NTCREATEX_DISP_OVERWRITE;
+               break;
+       case (OPENX_OPEN_FUNC_FAIL | OPENX_OPEN_FUNC_CREATE):
+               io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
+               break;
+       case (OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE):
+               io2->generic.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+               break;
+       case (OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE):
+               io2->generic.in.open_disposition = NTCREATEX_DISP_OVERWRITE_IF;
+               break;                  
+       default:
+               /* this one is very strange */
+               if ((open_mode & OPENX_MODE_ACCESS_MASK) == OPENX_MODE_ACCESS_EXEC) {
+                       io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
                        break;
-               case (OPENX_OPEN_FUNC_OPEN):
-                       io2.generic.in.open_disposition = NTCREATEX_DISP_OPEN;
-                       break;
-               case (OPENX_OPEN_FUNC_TRUNC):
-                       io2.generic.in.open_disposition = NTCREATEX_DISP_OVERWRITE;
-                       break;
-               case (OPENX_OPEN_FUNC_FAIL | OPENX_OPEN_FUNC_CREATE):
-                       io2.generic.in.open_disposition = NTCREATEX_DISP_CREATE;
-                       break;
-               case (OPENX_OPEN_FUNC_OPEN | OPENX_OPEN_FUNC_CREATE):
-                       io2.generic.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
-                       break;
-               case (OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE):
-                       io2.generic.in.open_disposition = NTCREATEX_DISP_OVERWRITE_IF;
-                       break;                  
                }
-               io2.generic.in.alloc_size = io->openx.in.size;
-               io2.generic.in.file_attr = io->openx.in.file_attrs;
-               io2.generic.in.fname = io->openx.in.fname;
+               return NT_STATUS_DOS(ERRDOS, ERRbadaccess);
+       }
+
+       return NT_STATUS_OK;
+}
 
-               status = req->tcon->ntvfs_ops->open(req, &io2);
+/* 
+   NTVFS open generic to any mapper
+*/
+_PUBLIC_ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
+                                struct ntvfs_request *req,
+                                union smb_open *io)
+{
+       NTSTATUS status;
+       union smb_open *io2;
+
+       io2 = talloc_zero(req, union smb_open);
+       if (io2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = ntvfs_map_async_setup(ntvfs, req,
+                                      io, io2, 
+                                      (second_stage_t)ntvfs_map_open_finish);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       io2->generic.level = RAW_OPEN_GENERIC;
+               
+       switch (io->generic.level) {
+       case RAW_OPEN_OPENX:
+               status = map_openx_open(io->openx.in.flags,
+                                       io->openx.in.open_mode, 
+                                       io->openx.in.open_func, 
+                                       io->openx.in.fname,
+                                       io2);
                if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+                       goto done;
                }
                
-               ZERO_STRUCT(io->openx.out);
-               io->openx.out.fnum = io2.generic.out.fnum;
-               io->openx.out.attrib = io2.generic.out.attrib;
-               io->openx.out.write_time = nt_time_to_unix(io2.generic.out.write_time);
-               io->openx.out.size = io2.generic.out.size;
+               io2->generic.in.file_attr = io->openx.in.file_attrs;
+               io2->generic.in.fname = io->openx.in.fname;
+               
+               status = ntvfs->ops->open(ntvfs, req, io2);
+               break;
+               
                
-               return NT_STATUS_OK;
-
-
        case RAW_OPEN_OPEN:
-               ZERO_STRUCT(io2.generic.in);
-               io2.generic.level = RAW_OPEN_GENERIC;
-               io2.generic.in.file_attr = io->open.in.search_attrs;
-               io2.generic.in.fname = io->open.in.fname;
-               io2.generic.in.open_disposition = NTCREATEX_DISP_OPEN;
-               DEBUG(9,("ntvfs_map_open(OPEN): mapping flags=0x%x\n",
-                       io->open.in.flags));
-               switch (io->open.in.flags & OPEN_FLAGS_MODE_MASK) {
-                       case OPEN_FLAGS_OPEN_READ:
-                               io2.generic.in.access_mask = GENERIC_RIGHTS_FILE_READ;
-                               io->open.out.rmode = DOS_OPEN_RDONLY;
-                               break;
-                       case OPEN_FLAGS_OPEN_WRITE:
-                               io2.generic.in.access_mask = GENERIC_RIGHTS_FILE_WRITE;
-                               io->open.out.rmode = DOS_OPEN_WRONLY;
-                               break;
-                       case OPEN_FLAGS_OPEN_RDWR:
-                       case 0xf: /* FCB mode */
-                               io2.generic.in.access_mask = GENERIC_RIGHTS_FILE_READ |
-                                       GENERIC_RIGHTS_FILE_WRITE;
-                               io->open.out.rmode = DOS_OPEN_RDWR; /* assume we got r/w */
-                               break;
-                       default:
-                               DEBUG(2,("ntvfs_map_open(OPEN): invalid mode 0x%x\n",
-                                       io->open.in.flags & OPEN_FLAGS_MODE_MASK));
-                               return NT_STATUS_INVALID_PARAMETER;
+               status = map_openx_open(0,
+                                       io->openold.in.open_mode, 
+                                       OPENX_OPEN_FUNC_OPEN, 
+                                       io->openold.in.fname,
+                                       io2);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto done;
                }
-               
-               switch(io->open.in.flags & OPEN_FLAGS_DENY_MASK) {
-                       case OPEN_FLAGS_DENY_DOS:
-                               /* DENY_DOS is quite strange - it depends on the filename! */
-                               /* REWRITE: is this necessary for OPEN? */
-                               if (is_exe_file(io->open.in.fname)) {
-                                       io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
-                               } else {
-                                       if ((io->open.in.flags & OPEN_FLAGS_MODE_MASK) == 
-                                           OPEN_FLAGS_OPEN_READ) {
-                                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ;
-                                       } else {
-                                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
-                                       }
-                               }
-                               break;
-                       case OPEN_FLAGS_DENY_ALL:
-                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
-                               break;
-                       case OPEN_FLAGS_DENY_WRITE:
-                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ;
-                               break;
-                       case OPEN_FLAGS_DENY_READ:
-                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_WRITE;
-                               break;
-                       case OPEN_FLAGS_DENY_NONE:
-                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_WRITE |
-                                               NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_DELETE;
-                               break;
-                       case 0x70: /* FCB mode */
-                               io2.generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
-                               break;
-                       default:
-                               DEBUG(2,("ntvfs_map_open(OPEN): invalid DENY 0x%x\n",
-                                       io->open.in.flags & OPEN_FLAGS_DENY_MASK));
-                               return NT_STATUS_INVALID_PARAMETER;
+
+               io2->generic.in.file_attr = io->openold.in.search_attrs;
+               io2->generic.in.fname = io->openold.in.fname;
+
+               status = ntvfs->ops->open(ntvfs, req, io2);
+               break;
+
+       case RAW_OPEN_T2OPEN:
+               io2->generic.level         = RAW_OPEN_NTTRANS_CREATE;
+
+               if (io->t2open.in.open_func == 0) {
+                       status = NT_STATUS_OBJECT_NAME_COLLISION;
+                       goto done;
                }
-               DEBUG(9,("ntvfs_map_open(OPEN): mapped flags=0x%x to access_mask=0x%x and share_access=0x%x\n",
-                       io->open.in.flags, io2.generic.in.access_mask, io2.generic.in.share_access));
 
-               status = req->tcon->ntvfs_ops->open(req, &io2);
+               status = map_openx_open(io->t2open.in.flags,
+                                       io->t2open.in.open_mode, 
+                                       io->t2open.in.open_func, 
+                                       io->t2open.in.fname,
+                                       io2);
                if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+                       goto done;
                }
-               
-               ZERO_STRUCT(io->openx.out);
-               io->open.out.fnum = io2.generic.out.fnum;
-               io->open.out.attrib = io2.generic.out.attrib;
-               io->open.out.write_time = nt_time_to_unix(io2.generic.out.write_time);
-               io->open.out.size = io2.generic.out.size;
-               io->open.out.rmode = DOS_OPEN_RDWR;
-               
-               return NT_STATUS_OK;
-       }
 
-       return NT_STATUS_INVALID_LEVEL;
+               io2->generic.in.file_attr        = io->t2open.in.file_attrs;
+               io2->generic.in.fname            = io->t2open.in.fname;
+               io2->generic.in.ea_list          = talloc(io2, struct smb_ea_list);
+               io2->generic.in.ea_list->num_eas = io->t2open.in.num_eas;
+               io2->generic.in.ea_list->eas     = io->t2open.in.eas;
+
+               status = ntvfs->ops->open(ntvfs, req, io2);
+               break;
+
+       case RAW_OPEN_MKNEW:
+               io2->generic.in.file_attr = io->mknew.in.attrib;
+               io2->generic.in.fname = io->mknew.in.fname;
+               io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
+               io2->generic.in.access_mask = 
+                       SEC_RIGHTS_FILE_READ |
+                       SEC_RIGHTS_FILE_WRITE;
+               io2->generic.in.share_access = 
+                       NTCREATEX_SHARE_ACCESS_READ | 
+                       NTCREATEX_SHARE_ACCESS_WRITE;
+               status = ntvfs->ops->open(ntvfs, req, io2);
+               break;
+
+       case RAW_OPEN_CREATE:
+               io2->generic.in.file_attr = io->mknew.in.attrib;
+               io2->generic.in.fname = io->mknew.in.fname;
+               io2->generic.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+               io2->generic.in.access_mask = 
+                       SEC_RIGHTS_FILE_READ |
+                       SEC_RIGHTS_FILE_WRITE;
+               io2->generic.in.share_access = 
+                       NTCREATEX_SHARE_ACCESS_READ | 
+                       NTCREATEX_SHARE_ACCESS_WRITE;
+               status = ntvfs->ops->open(ntvfs, req, io2);
+               break;
+
+       case RAW_OPEN_CTEMP:
+               io2->generic.in.file_attr = io->ctemp.in.attrib;
+               io2->generic.in.file_attr = 0;
+               io2->generic.in.fname = 
+                       talloc_asprintf(io2, "%s\\SRV%s", 
+                                       io->ctemp.in.directory,
+                                       generate_random_str_list(io2, 5, "0123456789"));
+               io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
+               io2->generic.in.access_mask = 
+                       SEC_RIGHTS_FILE_READ |
+                       SEC_RIGHTS_FILE_WRITE;
+               io2->generic.in.share_access = 
+                       NTCREATEX_SHARE_ACCESS_READ | 
+                       NTCREATEX_SHARE_ACCESS_WRITE;
+               status = ntvfs->ops->open(ntvfs, req, io2);
+               break;
+
+       default:
+               status = NT_STATUS_INVALID_LEVEL;
+               break;
+       }
+done:
+       return ntvfs_map_async_finish(req, status);
 }
 
 
 /* 
    NTVFS fsinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
+_PUBLIC_ NTSTATUS ntvfs_map_fsinfo(struct ntvfs_module_context *ntvfs,
+                                  struct ntvfs_request *req,
+                                  union smb_fsinfo *fs)
 {
        NTSTATUS status;
-       union smb_fsinfo fs2;
+       union smb_fsinfo *fs2;
+
+       fs2 = talloc(req, union smb_fsinfo);
+       if (fs2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        if (fs->generic.level == RAW_QFS_GENERIC) {
                return NT_STATUS_INVALID_LEVEL;
        }
+       
+       /* only used by the simple backend, which doesn't do async */
+       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
 
        /* ask the backend for the generic info */
-       fs2.generic.level = RAW_QFS_GENERIC;
+       fs2->generic.level = RAW_QFS_GENERIC;
 
-       status = req->tcon->ntvfs_ops->fsinfo(req, &fs2);
+       status = ntvfs->ops->fsinfo(ntvfs, req, fs2);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -277,7 +521,7 @@ NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 
                /* we need to scale the sizes to fit */
                for (bpunit=64; bpunit<0x10000; bpunit *= 2) {
-                       if (fs2.generic.out.blocks_total * (double)fs2.generic.out.block_size < bpunit * 512 * 65535.0) {
+                       if (fs2->generic.out.blocks_total * (double)fs2->generic.out.block_size < bpunit * 512 * 65535.0) {
                                break;
                        }
                }
@@ -285,9 +529,9 @@ NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
                fs->dskattr.out.blocks_per_unit = bpunit;
                fs->dskattr.out.block_size = 512;
                fs->dskattr.out.units_total = 
-                       (fs2.generic.out.blocks_total * (double)fs2.generic.out.block_size) / (bpunit * 512);
+                       (fs2->generic.out.blocks_total * (double)fs2->generic.out.block_size) / (bpunit * 512);
                fs->dskattr.out.units_free  = 
-                       (fs2.generic.out.blocks_free  * (double)fs2.generic.out.block_size) / (bpunit * 512);
+                       (fs2->generic.out.blocks_free  * (double)fs2->generic.out.block_size) / (bpunit * 512);
 
                /* we must return a maximum of 2G to old DOS systems, or they get very confused */
                if (bpunit > 64 && req->smb_conn->negotiate.protocol <= PROTOCOL_LANMAN2) {
@@ -299,63 +543,63 @@ NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
        }
 
        case RAW_QFS_ALLOCATION:
-               fs->allocation.out.fs_id = fs2.generic.out.fs_id;
-               fs->allocation.out.total_alloc_units = fs2.generic.out.blocks_total;
-               fs->allocation.out.avail_alloc_units = fs2.generic.out.blocks_free;
+               fs->allocation.out.fs_id = fs2->generic.out.fs_id;
+               fs->allocation.out.total_alloc_units = fs2->generic.out.blocks_total;
+               fs->allocation.out.avail_alloc_units = fs2->generic.out.blocks_free;
                fs->allocation.out.sectors_per_unit = 1;
-               fs->allocation.out.bytes_per_sector = fs2.generic.out.block_size;
+               fs->allocation.out.bytes_per_sector = fs2->generic.out.block_size;
                return NT_STATUS_OK;
 
        case RAW_QFS_VOLUME:
-               fs->volume.out.serial_number = fs2.generic.out.serial_number;
-               fs->volume.out.volume_name.s = fs2.generic.out.volume_name;
+               fs->volume.out.serial_number = fs2->generic.out.serial_number;
+               fs->volume.out.volume_name.s = fs2->generic.out.volume_name;
                return NT_STATUS_OK;
 
        case RAW_QFS_VOLUME_INFO:
        case RAW_QFS_VOLUME_INFORMATION:
-               fs->volume_info.out.create_time = fs2.generic.out.create_time;
-               fs->volume_info.out.serial_number = fs2.generic.out.serial_number;
-               fs->volume_info.out.volume_name.s = fs2.generic.out.volume_name;
+               fs->volume_info.out.create_time = fs2->generic.out.create_time;
+               fs->volume_info.out.serial_number = fs2->generic.out.serial_number;
+               fs->volume_info.out.volume_name.s = fs2->generic.out.volume_name;
                return NT_STATUS_OK;
 
        case RAW_QFS_SIZE_INFO:
        case RAW_QFS_SIZE_INFORMATION:
-               fs->size_info.out.total_alloc_units = fs2.generic.out.blocks_total;
-               fs->size_info.out.avail_alloc_units = fs2.generic.out.blocks_free;
+               fs->size_info.out.total_alloc_units = fs2->generic.out.blocks_total;
+               fs->size_info.out.avail_alloc_units = fs2->generic.out.blocks_free;
                fs->size_info.out.sectors_per_unit = 1;
-               fs->size_info.out.bytes_per_sector = fs2.generic.out.block_size;
+               fs->size_info.out.bytes_per_sector = fs2->generic.out.block_size;
                return NT_STATUS_OK;
 
        case RAW_QFS_DEVICE_INFO:
        case RAW_QFS_DEVICE_INFORMATION:
-               fs->device_info.out.device_type = fs2.generic.out.device_type;
-               fs->device_info.out.characteristics = fs2.generic.out.device_characteristics;
+               fs->device_info.out.device_type = fs2->generic.out.device_type;
+               fs->device_info.out.characteristics = fs2->generic.out.device_characteristics;
                return NT_STATUS_OK;
 
        case RAW_QFS_ATTRIBUTE_INFO:
        case RAW_QFS_ATTRIBUTE_INFORMATION:
-               fs->attribute_info.out.fs_attr = fs2.generic.out.fs_attr;
-               fs->attribute_info.out.max_file_component_length = fs2.generic.out.max_file_component_length;
-               fs->attribute_info.out.fs_type.s = fs2.generic.out.fs_type;
+               fs->attribute_info.out.fs_attr = fs2->generic.out.fs_attr;
+               fs->attribute_info.out.max_file_component_length = fs2->generic.out.max_file_component_length;
+               fs->attribute_info.out.fs_type.s = fs2->generic.out.fs_type;
                return NT_STATUS_OK;
 
        case RAW_QFS_QUOTA_INFORMATION:
                ZERO_STRUCT(fs->quota_information.out.unknown);
-               fs->quota_information.out.quota_soft = fs2.generic.out.quota_soft;
-               fs->quota_information.out.quota_hard = fs2.generic.out.quota_hard;
-               fs->quota_information.out.quota_flags = fs2.generic.out.quota_flags;
+               fs->quota_information.out.quota_soft = fs2->generic.out.quota_soft;
+               fs->quota_information.out.quota_hard = fs2->generic.out.quota_hard;
+               fs->quota_information.out.quota_flags = fs2->generic.out.quota_flags;
                return NT_STATUS_OK;
 
        case RAW_QFS_FULL_SIZE_INFORMATION:
-               fs->full_size_information.out.total_alloc_units = fs2.generic.out.blocks_total;
-               fs->full_size_information.out.call_avail_alloc_units = fs2.generic.out.blocks_free;
-               fs->full_size_information.out.actual_avail_alloc_units = fs2.generic.out.blocks_free;
+               fs->full_size_information.out.total_alloc_units = fs2->generic.out.blocks_total;
+               fs->full_size_information.out.call_avail_alloc_units = fs2->generic.out.blocks_free;
+               fs->full_size_information.out.actual_avail_alloc_units = fs2->generic.out.blocks_free;
                fs->full_size_information.out.sectors_per_unit = 1;
-               fs->full_size_information.out.bytes_per_sector = fs2.generic.out.block_size;
+               fs->full_size_information.out.bytes_per_sector = fs2->generic.out.block_size;
                return NT_STATUS_OK;
 
        case RAW_QFS_OBJECTID_INFORMATION:
-               fs->objectid_information.out.guid = fs2.generic.out.guid;
+               fs->objectid_information.out.guid = fs2->generic.out.guid;
                ZERO_STRUCT(fs->objectid_information.out.unknown);
                return NT_STATUS_OK;
        }
@@ -368,7 +612,9 @@ NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 /* 
    NTVFS fileinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info, union smb_fileinfo *info2)
+_PUBLIC_ NTSTATUS ntvfs_map_fileinfo(TALLOC_CTX *mem_ctx,
+                                    union smb_fileinfo *info, 
+                                    union smb_fileinfo *info2)
 {
        int i;
        /* and convert it to the required level using results in info2 */
@@ -472,8 +718,10 @@ NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info
        case RAW_FILEINFO_STREAM_INFORMATION:
                info->stream_info.out.num_streams = info2->generic.out.num_streams;
                if (info->stream_info.out.num_streams > 0) {
-                       info->stream_info.out.streams = talloc(req, 
-                               info->stream_info.out.num_streams * sizeof(struct stream_struct));
+                       info->stream_info.out.streams = 
+                               talloc_array(mem_ctx, 
+                                              struct stream_struct,
+                                              info->stream_info.out.num_streams);
                        if (!info->stream_info.out.streams) {
                                DEBUG(2,("ntvfs_map_fileinfo: no memory for %d streams\n",
                                        info->stream_info.out.num_streams));
@@ -482,7 +730,8 @@ NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info
                        for (i=0; i < info->stream_info.out.num_streams; i++) {
                                info->stream_info.out.streams[i] = info2->generic.out.streams[i];
                                info->stream_info.out.streams[i].stream_name.s = 
-                                       talloc_strdup(req, info2->generic.out.streams[i].stream_name.s);
+                                       talloc_strdup(info->stream_info.out.streams,
+                                                     info2->generic.out.streams[i].stream_name.s);
                                if (!info->stream_info.out.streams[i].stream_name.s) {
                                        DEBUG(2,("ntvfs_map_fileinfo: no memory for stream_name\n"));
                                        return NT_STATUS_NO_MEMORY;
@@ -493,13 +742,15 @@ NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info
 
        case RAW_FILEINFO_NAME_INFO:
        case RAW_FILEINFO_NAME_INFORMATION:
-               info->name_info.out.fname.s = talloc_strdup(req, info2->generic.out.fname.s);
+               info->name_info.out.fname.s = talloc_strdup(mem_ctx, info2->generic.out.fname.s);
+               NT_STATUS_HAVE_NO_MEMORY(info->name_info.out.fname.s);
                info->name_info.out.fname.private_length = info2->generic.out.fname.private_length;
                return NT_STATUS_OK;
                
        case RAW_FILEINFO_ALT_NAME_INFO:
        case RAW_FILEINFO_ALT_NAME_INFORMATION:
-               info->alt_name_info.out.fname.s = talloc_strdup(req, info2->generic.out.alt_fname.s);
+               info->alt_name_info.out.fname.s = talloc_strdup(mem_ctx, info2->generic.out.alt_fname.s);
+               NT_STATUS_HAVE_NO_MEMORY(info->alt_name_info.out.fname.s);
                info->alt_name_info.out.fname.private_length = info2->generic.out.alt_fname.private_length;
                return NT_STATUS_OK;
        
@@ -510,8 +761,9 @@ NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info
        case RAW_FILEINFO_ALL_EAS:
                info->all_eas.out.num_eas = info2->generic.out.num_eas;
                if (info->all_eas.out.num_eas > 0) {
-                       info->all_eas.out.eas = talloc(req, 
-                               info->all_eas.out.num_eas * sizeof(struct ea_struct));
+                       info->all_eas.out.eas = talloc_array(mem_ctx, 
+                                                              struct ea_struct,
+                                                              info->all_eas.out.num_eas);
                        if (!info->all_eas.out.eas) {
                                DEBUG(2,("ntvfs_map_fileinfo: no memory for %d eas\n",
                                        info->all_eas.out.num_eas));
@@ -520,13 +772,14 @@ NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info
                        for (i = 0; i < info->all_eas.out.num_eas; i++) {
                                info->all_eas.out.eas[i] = info2->generic.out.eas[i];
                                info->all_eas.out.eas[i].name.s = 
-                                       talloc_strdup(req, info2->generic.out.eas[i].name.s);
+                                       talloc_strdup(info->all_eas.out.eas,
+                                                     info2->generic.out.eas[i].name.s);
                                if (!info->all_eas.out.eas[i].name.s) {
                                        DEBUG(2,("ntvfs_map_fileinfo: no memory for stream_name\n"));
                                        return NT_STATUS_NO_MEMORY;
                                }
                                info->all_eas.out.eas[i].value.data = 
-                                       talloc_memdup(req,
+                                       talloc_memdup(info->all_eas.out.eas,
                                                info2->generic.out.eas[i].value.data,
                                                info2->generic.out.eas[i].value.length);
                                if (!info->all_eas.out.eas[i].value.data) {
@@ -590,45 +843,410 @@ NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info
 /* 
    NTVFS fileinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
+_PUBLIC_ NTSTATUS ntvfs_map_qfileinfo(struct ntvfs_module_context *ntvfs,
+                                     struct ntvfs_request *req,
+                                     union smb_fileinfo *info)
 {
        NTSTATUS status;
-       union smb_fileinfo info2;
+       union smb_fileinfo *info2;
+
+       info2 = talloc(req, union smb_fileinfo);
+       if (info2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        if (info->generic.level == RAW_FILEINFO_GENERIC) {
                return NT_STATUS_INVALID_LEVEL;
        }
 
        /* ask the backend for the generic info */
-       info2.generic.level = RAW_FILEINFO_GENERIC;
-       info2.generic.in.fnum = info->generic.in.fnum;
+       info2->generic.level = RAW_FILEINFO_GENERIC;
+       info2->generic.file.fnum = info->generic.file.fnum;
 
-       status = req->tcon->ntvfs_ops->qfileinfo(req, &info2);
+       /* only used by the simple backend, which doesn't do async */
+       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
+       status = ntvfs->ops->qfileinfo(ntvfs, req, info2);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
-       return ntvfs_map_fileinfo(req, info, &info2);
+       return ntvfs_map_fileinfo(req, info, info2);
 }
 
 /* 
    NTVFS pathinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
+_PUBLIC_ NTSTATUS ntvfs_map_qpathinfo(struct ntvfs_module_context *ntvfs,
+                                     struct ntvfs_request *req,
+                                     union smb_fileinfo *info)
 {
        NTSTATUS status;
-       union smb_fileinfo info2;
+       union smb_fileinfo *info2;
+
+       info2 = talloc(req, union smb_fileinfo);
+       if (info2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        if (info->generic.level == RAW_FILEINFO_GENERIC) {
                return NT_STATUS_INVALID_LEVEL;
        }
 
        /* ask the backend for the generic info */
-       info2.generic.level = RAW_FILEINFO_GENERIC;
-       info2.generic.in.fname = info->generic.in.fname;
+       info2->generic.level = RAW_FILEINFO_GENERIC;
+       info2->generic.file.path = info->generic.file.path;
+
+       /* only used by the simple backend, which doesn't do async */
+       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
+       status = ntvfs->ops->qpathinfo(ntvfs, req, info2);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+       return ntvfs_map_fileinfo(req, info, info2);
+}
+
+
+/* 
+   NTVFS lock generic to any mapper
+*/
+_PUBLIC_ NTSTATUS ntvfs_map_lock(struct ntvfs_module_context *ntvfs,
+                                struct ntvfs_request *req,
+                                union smb_lock *lck)
+{
+       union smb_lock *lck2;
+       struct smb_lock_entry *locks;
+
+       lck2 = talloc(req, union smb_lock);
+       if (lck2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       locks = talloc_array(lck2, struct smb_lock_entry, 1);
+       if (locks == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       switch (lck->generic.level) {
+       case RAW_LOCK_LOCKX:
+               return NT_STATUS_INVALID_LEVEL;
+
+       case RAW_LOCK_LOCK:
+               lck2->generic.in.ulock_cnt = 0;
+               lck2->generic.in.lock_cnt = 1;
+               break;
+
+       case RAW_LOCK_UNLOCK:
+               lck2->generic.in.ulock_cnt = 1;
+               lck2->generic.in.lock_cnt = 0;
+               break;
+       }
+
+       lck2->generic.level = RAW_LOCK_GENERIC;
+       lck2->generic.file.fnum = lck->lock.file.fnum;
+       lck2->generic.in.mode = 0;
+       lck2->generic.in.timeout = 0;
+       lck2->generic.in.locks = locks;
+       locks->pid = req->smbpid;
+       locks->offset = lck->lock.in.offset;
+       locks->count = lck->lock.in.count;
+
+       /* 
+        * we don't need to call ntvfs_map_async_setup() here,
+        * as lock() doesn't have any output fields
+        */
+
+       return ntvfs->ops->lock(ntvfs, req, lck2);
+}
+
+
+/* 
+   NTVFS write generic to any mapper
+*/
+static NTSTATUS ntvfs_map_write_finish(struct ntvfs_module_context *ntvfs,
+                                      struct ntvfs_request *req,
+                                      union smb_write *wr, 
+                                      union smb_write *wr2, 
+                                      NTSTATUS status)
+{
+       union smb_lock *lck;
+       union smb_close *cl;
+       uint_t state;
+
+       if (NT_STATUS_IS_ERR(status)) {
+               return status;
+       }
+
+       switch (wr->generic.level) {
+       case RAW_WRITE_WRITE:
+               wr->write.out.nwritten    = wr2->generic.out.nwritten;
+               break;
+
+       case RAW_WRITE_WRITEUNLOCK:
+               wr->writeunlock.out.nwritten = wr2->generic.out.nwritten;
+
+               lck = talloc(wr2, union smb_lock);
+               if (lck == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               lck->unlock.level      = RAW_LOCK_UNLOCK;
+               lck->unlock.file.fnum  = wr->writeunlock.file.fnum;
+               lck->unlock.in.count   = wr->writeunlock.in.count;
+               lck->unlock.in.offset  = wr->writeunlock.in.offset;
+
+               if (lck->unlock.in.count != 0) {
+                       /* do the lock sync for now */
+                       state = req->async_states->state;
+                       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+                       status = ntvfs->ops->lock(ntvfs, req, lck);
+                       req->async_states->state = state;
+               }
+               break;
+
+       case RAW_WRITE_WRITECLOSE:
+               wr->writeclose.out.nwritten    = wr2->generic.out.nwritten;
+
+               cl = talloc(wr2, union smb_close);
+               if (cl == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               cl->close.level           = RAW_CLOSE_CLOSE;
+               cl->close.file.fnum         = wr->writeclose.file.fnum;
+               cl->close.in.write_time   = wr->writeclose.in.mtime;
+
+               if (wr2->generic.in.count != 0) {
+                       /* do the close sync for now */
+                       state = req->async_states->state;
+                       req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+                       status = ntvfs->ops->close(ntvfs, req, cl);
+                       req->async_states->state = state;
+               }
+               break;
+
+       case RAW_WRITE_SPLWRITE:
+               break;
+       default:
+               return NT_STATUS_INVALID_LEVEL;
+       }
+
+       return status;
+}
+
+
+/* 
+   NTVFS write generic to any mapper
+*/
+_PUBLIC_ NTSTATUS ntvfs_map_write(struct ntvfs_module_context *ntvfs,
+                                 struct ntvfs_request *req,
+                                 union smb_write *wr)
+{
+       union smb_write *wr2;
+       NTSTATUS status;
 
-       status = req->tcon->ntvfs_ops->qpathinfo(req, &info2);
+       wr2 = talloc(req, union smb_write);
+       if (wr2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = ntvfs_map_async_setup(ntvfs, req, wr, wr2, 
+                                      (second_stage_t)ntvfs_map_write_finish);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
-       return ntvfs_map_fileinfo(req, info, &info2);
+
+       wr2->writex.level = RAW_WRITE_GENERIC;
+
+       switch (wr->generic.level) {
+       case RAW_WRITE_WRITEX:
+               status = NT_STATUS_INVALID_LEVEL;
+               break;
+
+       case RAW_WRITE_WRITE:
+               wr2->writex.file.fnum    = wr->write.file.fnum;
+               wr2->writex.in.offset    = wr->write.in.offset;
+               wr2->writex.in.wmode     = 0;
+               wr2->writex.in.remaining = wr->write.in.remaining;
+               wr2->writex.in.count     = wr->write.in.count;
+               wr2->writex.in.data      = wr->write.in.data;
+               status = ntvfs->ops->write(ntvfs, req, wr2);
+               break;
+
+       case RAW_WRITE_WRITEUNLOCK:
+               wr2->writex.file.fnum    = wr->writeunlock.file.fnum;
+               wr2->writex.in.offset    = wr->writeunlock.in.offset;
+               wr2->writex.in.wmode     = 0;
+               wr2->writex.in.remaining = wr->writeunlock.in.remaining;
+               wr2->writex.in.count     = wr->writeunlock.in.count;
+               wr2->writex.in.data      = wr->writeunlock.in.data;
+               status = ntvfs->ops->write(ntvfs, req, wr2);
+               break;
+
+       case RAW_WRITE_WRITECLOSE:
+               wr2->writex.file.fnum    = wr->writeclose.file.fnum;
+               wr2->writex.in.offset    = wr->writeclose.in.offset;
+               wr2->writex.in.wmode     = 0;
+               wr2->writex.in.remaining = 0;
+               wr2->writex.in.count     = wr->writeclose.in.count;
+               wr2->writex.in.data      = wr->writeclose.in.data;
+               status = ntvfs->ops->write(ntvfs, req, wr2);
+               break;
+
+       case RAW_WRITE_SPLWRITE:
+               wr2->writex.file.fnum    = wr->splwrite.file.fnum;
+               wr2->writex.in.offset    = 0;
+               wr2->writex.in.wmode     = 0;
+               wr2->writex.in.remaining = 0;
+               wr2->writex.in.count     = wr->splwrite.in.count;
+               wr2->writex.in.data      = wr->splwrite.in.data;
+               status = ntvfs->ops->write(ntvfs, req, wr2);
+               break;
+       }
+
+       return ntvfs_map_async_finish(req, status);
+}
+
+
+/* 
+   NTVFS read generic to any mapper - finish the out mapping
+*/
+static NTSTATUS ntvfs_map_read_finish(struct ntvfs_module_context *ntvfs,
+                                     struct ntvfs_request *req, 
+                                     union smb_read *rd, 
+                                     union smb_read *rd2,
+                                     NTSTATUS status)
+{
+       switch (rd->generic.level) {
+       case RAW_READ_READ:
+               rd->read.out.nread        = rd2->generic.out.nread;
+               break;
+       case RAW_READ_READBRAW:
+               rd->readbraw.out.nread    = rd2->generic.out.nread;
+               break;
+       case RAW_READ_LOCKREAD:
+               rd->lockread.out.nread = rd2->generic.out.nread;
+               break;
+       default:
+               return NT_STATUS_INVALID_LEVEL;
+       }
+
+       return status;
+}
+
+/* 
+   NTVFS read* to readx mapper
+*/
+_PUBLIC_ NTSTATUS ntvfs_map_read(struct ntvfs_module_context *ntvfs,
+                                struct ntvfs_request *req,
+                                union smb_read *rd)
+{
+       union smb_read *rd2;
+       union smb_lock *lck;
+       NTSTATUS status;
+       uint_t state;
+
+       rd2 = talloc(req, union smb_read);
+       if (rd2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = ntvfs_map_async_setup(ntvfs, req, rd, rd2, 
+                                      (second_stage_t)ntvfs_map_read_finish);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       rd2->readx.level = RAW_READ_READX;
+
+       switch (rd->generic.level) {
+       case RAW_READ_READX:
+               status = NT_STATUS_INVALID_LEVEL;
+               break;
+
+       case RAW_READ_READ:
+               rd2->readx.file.fnum    = rd->read.file.fnum;
+               rd2->readx.in.offset    = rd->read.in.offset;
+               rd2->readx.in.mincnt    = rd->read.in.count;
+               rd2->readx.in.maxcnt    = rd->read.in.count;
+               rd2->readx.in.remaining = rd->read.in.remaining;
+               rd2->readx.out.data     = rd->read.out.data;
+               status = ntvfs->ops->read(ntvfs, req, rd2);
+               break;
+
+       case RAW_READ_READBRAW:
+               rd2->readx.file.fnum    = rd->readbraw.file.fnum;
+               rd2->readx.in.offset    = rd->readbraw.in.offset;
+               rd2->readx.in.mincnt    = rd->readbraw.in.mincnt;
+               rd2->readx.in.maxcnt    = rd->readbraw.in.maxcnt;
+               rd2->readx.in.remaining = 0;
+               rd2->readx.out.data     = rd->readbraw.out.data;
+               status = ntvfs->ops->read(ntvfs, req, rd2);
+               break;
+
+       case RAW_READ_LOCKREAD:
+               /* do the initial lock sync for now */
+               state = req->async_states->state;
+               req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
+               lck = talloc(rd2, union smb_lock);
+               if (lck == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+               lck->lock.level      = RAW_LOCK_LOCK;
+               lck->lock.file.fnum  = rd->lockread.file.fnum;
+               lck->lock.in.count   = rd->lockread.in.count;
+               lck->lock.in.offset  = rd->lockread.in.offset;
+               status = ntvfs->ops->lock(ntvfs, req, lck);
+               req->async_states->state = state;
+
+               rd2->readx.file.fnum    = rd->lockread.file.fnum;
+               rd2->readx.in.offset    = rd->lockread.in.offset;
+               rd2->readx.in.mincnt    = rd->lockread.in.count;
+               rd2->readx.in.maxcnt    = rd->lockread.in.count;
+               rd2->readx.in.remaining = rd->lockread.in.remaining;
+               rd2->readx.out.data     = rd->lockread.out.data;
+
+               if (NT_STATUS_IS_OK(status)) {
+                       status = ntvfs->ops->read(ntvfs, req, rd2);
+               }
+               break;
+       }
+
+done:
+       return ntvfs_map_async_finish(req, status);
+}
+
+
+/* 
+   NTVFS close generic to any mapper
+*/
+_PUBLIC_ NTSTATUS ntvfs_map_close(struct ntvfs_module_context *ntvfs,
+                                 struct ntvfs_request *req,
+                                 union smb_close *cl)
+{
+       union smb_close *cl2;
+
+       cl2 = talloc(req, union smb_close);
+       if (cl2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       switch (cl->generic.level) {
+       case RAW_CLOSE_CLOSE:
+               return NT_STATUS_INVALID_LEVEL;
+
+       case RAW_CLOSE_SPLCLOSE:
+               cl2->close.level     = RAW_CLOSE_CLOSE;
+               cl2->close.file.fnum = cl->splclose.file.fnum;
+               break;
+       }
+
+       /* 
+        * we don't need to call ntvfs_map_async_setup() here,
+        * as close() doesn't have any output fields
+        */
+
+       return ntvfs->ops->close(ntvfs, req, cl2);
 }