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)

1 files changed, 7 insertions, 8 deletions

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;