r14157: - pass a struct ntvfs_request to the ntvfs layer

  (for now we just do #define ntvfs_request smbsrv_request,
   but it's the first step...)
- rename ntvfs_openfile() -> ntvfs_open()
- fix the talloc hierachie in some places in the ntvfs_map_*() code

metze
(This used to be commit ed9ed1f48f602354810937c0b0de850b44322191)

18 files changed, 79 insertions, 90 deletions

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index a5cd919ba3..a03499b733 100644
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -63,7 +63,7 @@ static void pvfs_translate_generic_bits(struct security_acl *acl)
   setup a default ACL for a file
 */
 static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs,
-				 struct smbsrv_request *req,
+				 struct ntvfs_request *req,
 				 struct pvfs_filename *name, int fd, 
 				 struct xattr_NTACL *acl)
 {
@@ -183,7 +183,7 @@ static void normalise_sd_flags(struct security_descriptor *sd, uint32_t secinfo_
   answer a setfileinfo for an ACL
 */
 NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs, 
-		      struct smbsrv_request *req,
+		      struct ntvfs_request *req,
 		      struct pvfs_filename *name, int fd, 
 		      uint32_t access_mask,
 		      union smb_setfileinfo *info)
@@ -281,7 +281,7 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
   answer a fileinfo query for the ACL
 */
 NTSTATUS pvfs_acl_query(struct pvfs_state *pvfs, 
-			struct smbsrv_request *req,
+			struct ntvfs_request *req,
 			struct pvfs_filename *name, int fd, 
 			union smb_fileinfo *info)
 {
@@ -325,7 +325,7 @@ NTSTATUS pvfs_acl_query(struct pvfs_state *pvfs,
   specific NT ACL
 */
 NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs, 
-				struct smbsrv_request *req,
+				struct ntvfs_request *req,
 				struct pvfs_filename *name,
 				uint32_t *access_mask)
 {
@@ -358,7 +358,7 @@ NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs,
   *access_mask is modified with the access actually granted
 */
 NTSTATUS pvfs_access_check(struct pvfs_state *pvfs, 
-			   struct smbsrv_request *req,
+			   struct ntvfs_request *req,
 			   struct pvfs_filename *name,
 			   uint32_t *access_mask)
 {
@@ -410,7 +410,7 @@ NTSTATUS pvfs_access_check(struct pvfs_state *pvfs,
   do not take or return an access check mask
 */
 NTSTATUS pvfs_access_check_simple(struct pvfs_state *pvfs, 
-				  struct smbsrv_request *req,
+				  struct ntvfs_request *req,
 				  struct pvfs_filename *name,
 				  uint32_t access_needed)
 {
@@ -424,7 +424,7 @@ NTSTATUS pvfs_access_check_simple(struct pvfs_state *pvfs,
   access check for creating a new file/directory
 */
 NTSTATUS pvfs_access_check_create(struct pvfs_state *pvfs, 
-				  struct smbsrv_request *req,
+				  struct ntvfs_request *req,
 				  struct pvfs_filename *name,
 				  uint32_t *access_mask)
 {
@@ -452,7 +452,7 @@ NTSTATUS pvfs_access_check_create(struct pvfs_state *pvfs,
   access check for creating a new file/directory - no access mask supplied
 */
 NTSTATUS pvfs_access_check_parent(struct pvfs_state *pvfs, 
-				  struct smbsrv_request *req,
+				  struct ntvfs_request *req,
 				  struct pvfs_filename *name,
 				  uint32_t access_mask)
 {
@@ -578,7 +578,7 @@ static NTSTATUS pvfs_acl_inherit_aces(struct pvfs_state *pvfs,
   as the default ACL applies anyway
 */
 NTSTATUS pvfs_acl_inherit(struct pvfs_state *pvfs, 
-			  struct smbsrv_request *req,
+			  struct ntvfs_request *req,
 			  struct pvfs_filename *name,
 			  int fd)
 {
diff --git a/source4/ntvfs/posix/pvfs_flush.c b/source4/ntvfs/posix/pvfs_flush.c
index 5c1132db19..bf6e23d520 100644
--- a/source4/ntvfs/posix/pvfs_flush.c
+++ b/source4/ntvfs/posix/pvfs_flush.c
@@ -40,7 +40,7 @@ static void pvfs_flush_file(struct pvfs_state *pvfs, struct pvfs_file *f)
   flush a fnum
 */
 NTSTATUS pvfs_flush(struct ntvfs_module_context *ntvfs,
-		    struct smbsrv_request *req, struct smb_flush *io)
+		    struct ntvfs_request *req, struct smb_flush *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c
index be87599b87..6b8f0504f2 100644
--- a/source4/ntvfs/posix/pvfs_fsinfo.c
+++ b/source4/ntvfs/posix/pvfs_fsinfo.c
@@ -79,7 +79,7 @@ static NTSTATUS pvfs_cache_base_fs_uuid(struct pvfs_state *pvfs, struct stat *st
   return filesystem space info
 */
 NTSTATUS pvfs_fsinfo(struct ntvfs_module_context *ntvfs,
-		     struct smbsrv_request *req, union smb_fsinfo *fs)
+		     struct ntvfs_request *req, union smb_fsinfo *fs)
 {
 	NTSTATUS status;
 	struct pvfs_state *pvfs = ntvfs->private_data;
diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c
index b35a98fa87..aaa9db9986 100644
--- a/source4/ntvfs/posix/pvfs_ioctl.c
+++ b/source4/ntvfs/posix/pvfs_ioctl.c
@@ -28,7 +28,7 @@
   old ioctl interface 
 */
 static NTSTATUS pvfs_ioctl_old(struct ntvfs_module_context *ntvfs,
-			struct smbsrv_request *req, union smb_ioctl *io)
+			struct ntvfs_request *req, union smb_ioctl *io)
 {
 	return NT_STATUS_DOS(ERRSRV, ERRerror);
 }
@@ -37,7 +37,7 @@ static NTSTATUS pvfs_ioctl_old(struct ntvfs_module_context *ntvfs,
   nt ioctl interface 
 */
 static NTSTATUS pvfs_ntioctl(struct ntvfs_module_context *ntvfs,
-			     struct smbsrv_request *req, union smb_ioctl *io)
+			     struct ntvfs_request *req, union smb_ioctl *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
@@ -62,7 +62,7 @@ static NTSTATUS pvfs_ntioctl(struct ntvfs_module_context *ntvfs,
   ioctl interface 
 */
 NTSTATUS pvfs_ioctl(struct ntvfs_module_context *ntvfs,
-		    struct smbsrv_request *req, union smb_ioctl *io)
+		    struct ntvfs_request *req, union smb_ioctl *io)
 {
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 5031e4cef7..d2317c1852 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -53,7 +53,7 @@ struct pvfs_pending_lock {
 	struct pvfs_state *pvfs;
 	union smb_lock *lck;
 	struct pvfs_file *f;
-	struct smbsrv_request *req;
+	struct ntvfs_request *req;
 	int pending_lock;
 	void *wait_handle;
 	struct timeval end_time;
@@ -64,7 +64,7 @@ struct pvfs_pending_lock {
   the locks we did get and send an error
 */
 static void pvfs_lock_async_failed(struct pvfs_state *pvfs,
-				   struct smbsrv_request *req,
+				   struct ntvfs_request *req,
 				   struct pvfs_file *f,
 				   struct smb_lock_entry *locks,
 				   int i,
@@ -96,7 +96,7 @@ static void pvfs_pending_lock_continue(void *private, enum pvfs_wait_notice reas
 	struct pvfs_pending_lock *pending = private;
 	struct pvfs_state *pvfs = pending->pvfs;
 	struct pvfs_file *f = pending->f;
-	struct smbsrv_request *req = pending->req;
+	struct ntvfs_request *req = pending->req;
 	union smb_lock *lck = pending->lck;
 	struct smb_lock_entry *locks;
 	enum brl_type rw;
@@ -234,7 +234,7 @@ void pvfs_lock_close(struct pvfs_state *pvfs, struct pvfs_file *f)
 /*
   cancel a set of locks
 */
-static NTSTATUS pvfs_lock_cancel(struct pvfs_state *pvfs, struct smbsrv_request *req, union smb_lock *lck,
+static NTSTATUS pvfs_lock_cancel(struct pvfs_state *pvfs, struct ntvfs_request *req, union smb_lock *lck,
 				 struct pvfs_file *f)
 {
 	struct pvfs_pending_lock *p;
@@ -271,7 +271,7 @@ static NTSTATUS pvfs_lock_cancel(struct pvfs_state *pvfs, struct smbsrv_request
   lock or unlock a byte range
 */
 NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
-		   struct smbsrv_request *req, union smb_lock *lck)
+		   struct ntvfs_request *req, union smb_lock *lck)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
@@ -282,7 +282,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
 	NTSTATUS status;
 
 	if (lck->generic.level != RAW_LOCK_GENERIC) {
-		return ntvfs_map_lock(req, lck, ntvfs);
+		return ntvfs_map_lock(ntvfs, req, lck);
 	}
 
 	f = pvfs_find_fd(pvfs, req, lck->lockx.in.fnum);
diff --git a/source4/ntvfs/posix/pvfs_mkdir.c b/source4/ntvfs/posix/pvfs_mkdir.c
index 591ec7ca84..fe2c5d0467 100644
--- a/source4/ntvfs/posix/pvfs_mkdir.c
+++ b/source4/ntvfs/posix/pvfs_mkdir.c
@@ -29,7 +29,7 @@
   create a directory with EAs
 */
 static NTSTATUS pvfs_t2mkdir(struct pvfs_state *pvfs,
-			     struct smbsrv_request *req, union smb_mkdir *md)
+			     struct ntvfs_request *req, union smb_mkdir *md)
 {
 	NTSTATUS status;
 	struct pvfs_filename *name;
@@ -90,7 +90,7 @@ static NTSTATUS pvfs_t2mkdir(struct pvfs_state *pvfs,
   create a directory
 */
 NTSTATUS pvfs_mkdir(struct ntvfs_module_context *ntvfs,
-		    struct smbsrv_request *req, union smb_mkdir *md)
+		    struct ntvfs_request *req, union smb_mkdir *md)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	NTSTATUS status;
@@ -142,7 +142,7 @@ NTSTATUS pvfs_mkdir(struct ntvfs_module_context *ntvfs,
   remove a directory
 */
 NTSTATUS pvfs_rmdir(struct ntvfs_module_context *ntvfs,
-		    struct smbsrv_request *req, struct smb_rmdir *rd)
+		    struct ntvfs_request *req, struct smb_rmdir *rd)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	NTSTATUS status;
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index e24887ca96..618ddf141b 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -39,7 +39,7 @@
   find open file handle given fnum
 */
 struct pvfs_file *pvfs_find_fd(struct pvfs_state *pvfs,
-			       struct smbsrv_request *req, uint16_t fnum)
+			       struct ntvfs_request *req, uint16_t fnum)
 {
 	struct pvfs_file *f;
 
@@ -123,7 +123,7 @@ static int pvfs_dir_fnum_destructor(void *p)
   setup any EAs and the ACL on newly created files/directories
 */
 static NTSTATUS pvfs_open_setup_eas_acl(struct pvfs_state *pvfs,
-					struct smbsrv_request *req,
+					struct ntvfs_request *req,
 					struct pvfs_filename *name,
 					int fd,	int fnum,
 					union smb_open *io)
@@ -186,7 +186,7 @@ static NTSTATUS pvfs_locking_key(struct pvfs_filename *name,
   open a directory
 */
 static NTSTATUS pvfs_open_directory(struct pvfs_state *pvfs, 
-				    struct smbsrv_request *req, 
+				    struct ntvfs_request *req, 
 				    struct pvfs_filename *name, 
 				    union smb_open *io)
 {
@@ -537,7 +537,7 @@ static NTSTATUS pvfs_brl_locking_key(struct pvfs_filename *name,
   create a new file
 */
 static NTSTATUS pvfs_create_file(struct pvfs_state *pvfs, 
-				 struct smbsrv_request *req, 
+				 struct ntvfs_request *req, 
 				 struct pvfs_filename *name, 
 				 union smb_open *io)
 {
@@ -743,7 +743,7 @@ cleanup_delete:
 */
 struct pvfs_open_retry {
 	struct ntvfs_module_context *ntvfs;
-	struct smbsrv_request *req;
+	struct ntvfs_request *req;
 	union smb_open *io;
 	void *wait_handle;
 	DATA_BLOB odb_locking_key;
@@ -772,7 +772,7 @@ static void pvfs_open_retry(void *private, enum pvfs_wait_notice reason)
 {
 	struct pvfs_open_retry *r = private;
 	struct ntvfs_module_context *ntvfs = r->ntvfs;
-	struct smbsrv_request *req = r->req;
+	struct ntvfs_request *req = r->req;
 	union smb_open *io = r->io;
 	NTSTATUS status;
 
@@ -828,7 +828,7 @@ static void pvfs_open_retry(void *private, enum pvfs_wait_notice reason)
   open processing continues.
 */
 static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs,
-				   struct smbsrv_request *req, union smb_open *io,
+				   struct ntvfs_request *req, union smb_open *io,
 				   struct pvfs_file *f, struct odb_lock *lck)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
@@ -904,7 +904,7 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs,
   setup for a open retry after a sharing violation
 */
 static NTSTATUS pvfs_open_setup_retry(struct ntvfs_module_context *ntvfs,
-				      struct smbsrv_request *req, 
+				      struct ntvfs_request *req, 
 				      union smb_open *io,
 				      struct pvfs_file *f,
 				      struct odb_lock *lck)
@@ -964,7 +964,7 @@ static NTSTATUS pvfs_open_setup_retry(struct ntvfs_module_context *ntvfs,
   open a file
 */
 NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
-		   struct smbsrv_request *req, union smb_open *io)
+		   struct ntvfs_request *req, union smb_open *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	int flags;
@@ -982,7 +982,7 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
 	   different open calls. */
 	if (io->generic.level != RAW_OPEN_GENERIC &&
 	    io->generic.level != RAW_OPEN_NTTRANS_CREATE) {
-		return ntvfs_map_open(req, io, ntvfs);
+		return ntvfs_map_open(ntvfs, req, io);
 	}
 
 	/* resolve the cifs name to a posix name */
@@ -1264,7 +1264,7 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
   close a file
 */
 NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs,
-		    struct smbsrv_request *req, union smb_close *io)
+		    struct ntvfs_request *req, union smb_close *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
@@ -1275,7 +1275,7 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs,
 	}
 
 	if (io->generic.level != RAW_CLOSE_CLOSE) {
-		return ntvfs_map_close(req, io, ntvfs);
+		return ntvfs_map_close(ntvfs, req, io);
 	}
 
 	f = pvfs_find_fd(pvfs, req, io->close.in.fnum);
@@ -1303,7 +1303,7 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs,
   logoff - close all file descriptors open by a vuid
 */
 NTSTATUS pvfs_logoff(struct ntvfs_module_context *ntvfs,
-		     struct smbsrv_request *req)
+		     struct ntvfs_request *req)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f, *next;
@@ -1323,7 +1323,7 @@ NTSTATUS pvfs_logoff(struct ntvfs_module_context *ntvfs,
   exit - close files for the current pid
 */
 NTSTATUS pvfs_exit(struct ntvfs_module_context *ntvfs,
-		   struct smbsrv_request *req)
+		   struct ntvfs_request *req)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f, *next;
@@ -1343,7 +1343,7 @@ NTSTATUS pvfs_exit(struct ntvfs_module_context *ntvfs,
   change the delete on close flag on an already open file
 */
 NTSTATUS pvfs_set_delete_on_close(struct pvfs_state *pvfs,
-				  struct smbsrv_request *req, 
+				  struct ntvfs_request *req, 
 				  struct pvfs_file *f, BOOL del_on_close)
 {
 	struct odb_lock *lck;
@@ -1382,7 +1382,7 @@ NTSTATUS pvfs_set_delete_on_close(struct pvfs_state *pvfs,
   already open file
 */
 NTSTATUS pvfs_can_delete(struct pvfs_state *pvfs, 
-			 struct smbsrv_request *req,
+			 struct ntvfs_request *req,
 			 struct pvfs_filename *name,
 			 struct odb_lock **lckp)
 {
@@ -1427,7 +1427,7 @@ NTSTATUS pvfs_can_delete(struct pvfs_state *pvfs,
   already open file
 */
 NTSTATUS pvfs_can_rename(struct pvfs_state *pvfs, 
-			 struct smbsrv_request *req,
+			 struct ntvfs_request *req,
 			 struct pvfs_filename *name,
 			 struct odb_lock **lckp)
 {
@@ -1467,7 +1467,7 @@ NTSTATUS pvfs_can_rename(struct pvfs_state *pvfs,
   already open file
 */
 NTSTATUS pvfs_can_stat(struct pvfs_state *pvfs, 
-		       struct smbsrv_request *req,
+		       struct ntvfs_request *req,
 		       struct pvfs_filename *name)
 {
 	NTSTATUS status;
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c
index ca26331373..5d908cbee2 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -126,7 +126,7 @@ static NTSTATUS pvfs_query_all_eas(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
   approximately map a struct pvfs_filename to a generic fileinfo struct
 */
 static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs, 
-				  struct smbsrv_request *req,
+				  struct ntvfs_request *req,
 				  struct pvfs_filename *name, union smb_fileinfo *info, 
 				  int fd)
 {
@@ -282,7 +282,7 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs,
   return info on a pathname
 */
 NTSTATUS pvfs_qpathinfo(struct ntvfs_module_context *ntvfs,
-		        struct smbsrv_request *req, union smb_fileinfo *info)
+		        struct ntvfs_request *req, union smb_fileinfo *info)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_filename *name;
@@ -318,7 +318,7 @@ NTSTATUS pvfs_qpathinfo(struct ntvfs_module_context *ntvfs,
   query info on a open file
 */
 NTSTATUS pvfs_qfileinfo(struct ntvfs_module_context *ntvfs,
-		        struct smbsrv_request *req, union smb_fileinfo *info)
+		        struct ntvfs_request *req, union smb_fileinfo *info)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c
index fb656470b8..93a8060926 100644
--- a/source4/ntvfs/posix/pvfs_read.c
+++ b/source4/ntvfs/posix/pvfs_read.c
@@ -28,7 +28,7 @@
   read from a file
 */
 NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
-		   struct smbsrv_request *req, union smb_read *rd)
+		   struct ntvfs_request *req, union smb_read *rd)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	ssize_t ret;
@@ -38,7 +38,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
 	uint32_t mask;
 
 	if (rd->generic.level != RAW_READ_READX) {
-		return ntvfs_map_read(req, rd, ntvfs);
+		return ntvfs_map_read(ntvfs, req, rd);
 	}
 
 	f = pvfs_find_fd(pvfs, req, rd->readx.in.fnum);
diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c
index 7f1f43e719..81f6ef1bf7 100644
--- a/source4/ntvfs/posix/pvfs_rename.c
+++ b/source4/ntvfs/posix/pvfs_rename.c
@@ -121,7 +121,7 @@ static const char *pvfs_resolve_wildcard(TALLOC_CTX *mem_ctx,
   rename one file from a wildcard set
 */
 static NTSTATUS pvfs_rename_one(struct pvfs_state *pvfs, 
-				struct smbsrv_request *req, 
+				struct ntvfs_request *req, 
 				const char *dir_path,
 				const char *fname1,
 				const char *fname2,
@@ -190,7 +190,7 @@ failed:
   rename a set of files with wildcards
 */
 static NTSTATUS pvfs_rename_wildcard(struct pvfs_state *pvfs, 
-				     struct smbsrv_request *req, 
+				     struct ntvfs_request *req, 
 				     union smb_rename *ren, 
 				     struct pvfs_filename *name1, 
 				     struct pvfs_filename *name2)
@@ -244,7 +244,7 @@ static NTSTATUS pvfs_rename_wildcard(struct pvfs_state *pvfs,
   rename a set of files - SMBmv interface
 */
 static NTSTATUS pvfs_rename_mv(struct ntvfs_module_context *ntvfs,
-			       struct smbsrv_request *req, union smb_rename *ren)
+			       struct ntvfs_request *req, union smb_rename *ren)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	NTSTATUS status;
@@ -309,7 +309,7 @@ static NTSTATUS pvfs_rename_mv(struct ntvfs_module_context *ntvfs,
   rename a set of files - ntrename interface
 */
 static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs,
-			       struct smbsrv_request *req, union smb_rename *ren)
+			       struct ntvfs_request *req, union smb_rename *ren)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	NTSTATUS status;
@@ -408,7 +408,7 @@ static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs,
   rename a set of files - ntrename interface
 */
 NTSTATUS pvfs_rename(struct ntvfs_module_context *ntvfs,
-		     struct smbsrv_request *req, union smb_rename *ren)
+		     struct ntvfs_request *req, union smb_rename *ren)
 {
 	switch (ren->generic.level) {
 	case RAW_RENAME_RENAME:
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index db197c7b62..6aa9163f1e 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -323,7 +323,7 @@ static void pvfs_search_cleanup(struct pvfs_state *pvfs)
    list files in a directory matching a wildcard pattern - old SMBsearch interface
 */
 static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs,
-				      struct smbsrv_request *req, union smb_search_first *io, 
+				      struct ntvfs_request *req, union smb_search_first *io, 
 				      void *search_private, 
 				      BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -411,7 +411,7 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs,
 
 /* continue a old style search */
 static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs,
-				     struct smbsrv_request *req, union smb_search_next *io, 
+				     struct ntvfs_request *req, union smb_search_next *io, 
 				     void *search_private, 
 				     BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -455,7 +455,7 @@ static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs,
    list files in a directory matching a wildcard pattern
 */
 NTSTATUS pvfs_search_first(struct ntvfs_module_context *ntvfs,
-			   struct smbsrv_request *req, union smb_search_first *io, 
+			   struct ntvfs_request *req, union smb_search_first *io, 
 			   void *search_private, 
 			   BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -554,7 +554,7 @@ NTSTATUS pvfs_search_first(struct ntvfs_module_context *ntvfs,
 
 /* continue a search */
 NTSTATUS pvfs_search_next(struct ntvfs_module_context *ntvfs,
-			  struct smbsrv_request *req, union smb_search_next *io, 
+			  struct ntvfs_request *req, union smb_search_next *io, 
 			  void *search_private, 
 			  BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -619,7 +619,7 @@ NTSTATUS pvfs_search_next(struct ntvfs_module_context *ntvfs,
 
 /* close a search */
 NTSTATUS pvfs_search_close(struct ntvfs_module_context *ntvfs,
-			   struct smbsrv_request *req, union smb_search_close *io)
+			   struct ntvfs_request *req, union smb_search_close *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_search_state *search;
diff --git a/source4/ntvfs/posix/pvfs_seek.c b/source4/ntvfs/posix/pvfs_seek.c
index c4dd30bd85..33656e4004 100644
--- a/source4/ntvfs/posix/pvfs_seek.c
+++ b/source4/ntvfs/posix/pvfs_seek.c
@@ -27,7 +27,7 @@
   seek in a file
 */
 NTSTATUS pvfs_seek(struct ntvfs_module_context *ntvfs,
-		   struct smbsrv_request *req, struct smb_seek *io)
+		   struct ntvfs_request *req, struct smb_seek *io)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_file *f;
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index 69c9cd5e4a..db03149642 100644
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -69,7 +69,7 @@ static uint32_t pvfs_setfileinfo_access(union smb_setfileinfo *info)
   rename_information level
 */
 static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs, 
-					struct smbsrv_request *req, 
+					struct ntvfs_request *req, 
 					struct pvfs_filename *name,
 					struct smb_rename_information *r)
 {
@@ -238,7 +238,7 @@ NTSTATUS pvfs_setfileinfo_ea_set(struct pvfs_state *pvfs,
   set info on a open file
 */
 NTSTATUS pvfs_setfileinfo(struct ntvfs_module_context *ntvfs,
-			  struct smbsrv_request *req, 
+			  struct ntvfs_request *req, 
 			  union smb_setfileinfo *info)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
@@ -425,7 +425,7 @@ NTSTATUS pvfs_setfileinfo(struct ntvfs_module_context *ntvfs,
   set info on a pathname
 */
 NTSTATUS pvfs_setpathinfo(struct ntvfs_module_context *ntvfs,
-			  struct smbsrv_request *req, union smb_setfileinfo *info)
+			  struct ntvfs_request *req, union smb_setfileinfo *info)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_filename *name;
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c
index 8eea2c47b8..ee90adba45 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -28,7 +28,7 @@
   unlink a stream
  */
 static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs, 
-				   struct smbsrv_request *req,
+				   struct ntvfs_request *req,
 				   struct pvfs_filename *name, 
 				   uint16_t attrib)
 {
@@ -58,7 +58,7 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs,
   unlink one file
 */
 static NTSTATUS pvfs_unlink_one(struct pvfs_state *pvfs, 
-				struct smbsrv_request *req,
+				struct ntvfs_request *req,
 				const char *unix_path, 
 				const char *fname, uint32_t attrib)
 {
@@ -113,7 +113,7 @@ static NTSTATUS pvfs_unlink_one(struct pvfs_state *pvfs,
   The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
 */
 NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
-		     struct smbsrv_request *req, struct smb_unlink *unl)
+		     struct ntvfs_request *req, struct smb_unlink *unl)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_dir *dir;
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index c363388408..241382ba0b 100644
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -37,7 +37,7 @@ struct pvfs_wait {
 	int msg_type;
 	struct messaging_context *msg_ctx;
 	struct event_context *ev;
-	struct smbsrv_request *req;
+	struct ntvfs_request *req;
 	enum pvfs_wait_notice reason;
 };
 
@@ -47,7 +47,7 @@ struct pvfs_wait {
   previous ntvfs handlers in the chain (such as security context)
 */
 NTSTATUS pvfs_async_setup(struct ntvfs_module_context *ntvfs,
-			  struct smbsrv_request *req, void *private)
+			  struct ntvfs_request *req, void *private)
 {
 	struct pvfs_wait *pwait = private;
 	pwait->handler(pwait->private, pwait->reason);
@@ -61,7 +61,7 @@ static void pvfs_wait_dispatch(struct messaging_context *msg, void *private, uin
 			       uint32_t src, DATA_BLOB *data)
 {
 	struct pvfs_wait *pwait = private;
-	struct smbsrv_request *req;
+	struct ntvfs_request *req;
 
 	/* we need to check that this one is for us. See
 	   messaging_send_ptr() for the other side of this.
@@ -90,7 +90,7 @@ static void pvfs_wait_timeout(struct event_context *ev,
 			      struct timed_event *te, struct timeval t, void *private)
 {
 	struct pvfs_wait *pwait = talloc_get_type(private, struct pvfs_wait);
-	struct smbsrv_request *req = pwait->req;
+	struct ntvfs_request *req = pwait->req;
 
 	pwait->reason = PVFS_WAIT_TIMEOUT;
 
@@ -118,8 +118,8 @@ static int pvfs_wait_destructor(void *ptr)
   the return value is a handle. To stop waiting talloc_free this
   handle.
 */
- void *pvfs_wait_message(struct pvfs_state *pvfs, 
-			struct smbsrv_request *req, 
+void *pvfs_wait_message(struct pvfs_state *pvfs, 
+			struct ntvfs_request *req, 
 			int msg_type, 
 			struct timeval end_time,
 			void (*fn)(void *, enum pvfs_wait_notice),
@@ -167,7 +167,7 @@ static int pvfs_wait_destructor(void *ptr)
 /*
   cancel an outstanding async request
 */
-NTSTATUS pvfs_cancel(struct ntvfs_module_context *ntvfs, struct smbsrv_request *req)
+NTSTATUS pvfs_cancel(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_wait *pwait;
diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c
index 025ea3f3eb..d206e3b830 100644
--- a/source4/ntvfs/posix/pvfs_write.c
+++ b/source4/ntvfs/posix/pvfs_write.c
@@ -29,7 +29,7 @@
   write to a file
 */
 NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs,
-		    struct smbsrv_request *req, union smb_write *wr)
+		    struct ntvfs_request *req, union smb_write *wr)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	ssize_t ret;
@@ -37,7 +37,7 @@ NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs,
 	NTSTATUS status;
 
 	if (wr->generic.level != RAW_WRITE_WRITEX) {
-		return ntvfs_map_write(req, wr, ntvfs);
+		return ntvfs_map_write(ntvfs, req, wr);
 	}
 
 	f = pvfs_find_fd(pvfs, req, wr->writex.in.fnum);
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index e600be446a..66fbc4bb4c 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -112,7 +112,7 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
   that comes later)
 */
 static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
-			     struct smbsrv_request *req, const char *sharename)
+			     struct ntvfs_request *req, const char *sharename)
 {
 	struct smbsrv_tcon *tcon = req->tcon;
 	struct pvfs_state *pvfs;
@@ -194,8 +194,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
 /*
   disconnect from a share
 */
-static NTSTATUS pvfs_disconnect(struct ntvfs_module_context *ntvfs,
-				struct smbsrv_tcon *tcon)
+static NTSTATUS pvfs_disconnect(struct ntvfs_module_context *ntvfs)
 {
 	return NT_STATUS_OK;
 }
@@ -204,7 +203,7 @@ static NTSTATUS pvfs_disconnect(struct ntvfs_module_context *ntvfs,
   check if a directory exists
 */
 static NTSTATUS pvfs_chkpath(struct ntvfs_module_context *ntvfs,
-			     struct smbsrv_request *req, struct smb_chkpath *cp)
+			     struct ntvfs_request *req, struct smb_chkpath *cp)
 {
 	struct pvfs_state *pvfs = ntvfs->private_data;
 	struct pvfs_filename *name;
@@ -229,7 +228,7 @@ static NTSTATUS pvfs_chkpath(struct ntvfs_module_context *ntvfs,
   copy a set of files
 */
 static NTSTATUS pvfs_copy(struct ntvfs_module_context *ntvfs,
-			  struct smbsrv_request *req, struct smb_copy *cp)
+			  struct ntvfs_request *req, struct smb_copy *cp)
 {
 	DEBUG(0,("pvfs_copy not implemented\n"));
 	return NT_STATUS_NOT_SUPPORTED;
@@ -239,14 +238,14 @@ static NTSTATUS pvfs_copy(struct ntvfs_module_context *ntvfs,
   return print queue info
 */
 static NTSTATUS pvfs_lpq(struct ntvfs_module_context *ntvfs,
-			 struct smbsrv_request *req, union smb_lpq *lpq)
+			 struct ntvfs_request *req, union smb_lpq *lpq)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
 
 /* SMBtrans - not used on file shares */
 static NTSTATUS pvfs_trans(struct ntvfs_module_context *ntvfs,
-			   struct smbsrv_request *req, struct smb_trans2 *trans2)
+			   struct ntvfs_request *req, struct smb_trans2 *trans2)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -270,7 +269,7 @@ NTSTATUS ntvfs_posix_init(void)
 	ops.chkpath = pvfs_chkpath;
 	ops.qpathinfo = pvfs_qpathinfo;
 	ops.setpathinfo = pvfs_setpathinfo;
-	ops.openfile = pvfs_open;
+	ops.open = pvfs_open;
 	ops.mkdir = pvfs_mkdir;
 	ops.rmdir = pvfs_rmdir;
 	ops.rename = pvfs_rename;
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 3219631ebb..a22b55198c 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -195,16 +195,6 @@ struct pvfs_dir;
 /* types of notification for pvfs wait events */
 enum pvfs_wait_notice {PVFS_WAIT_EVENT, PVFS_WAIT_TIMEOUT, PVFS_WAIT_CANCEL};
 
-
-/* putting this prototype here avoids us having to expose this whole header in the
-   rest of Samba */
-void *pvfs_wait_message(struct pvfs_state *pvfs, 
-			 struct smbsrv_request *req, 
-			 int msg_type, 
-			 struct timeval end_time,
-			 void (*fn)(void *, enum pvfs_wait_notice),
-			 void *private);
-
 #include "ntvfs/posix/vfs_posix_proto.h"
 
 #endif /* _VFS_POSIX_H_ */