r2751: this is a new ntvfs design which tries to solve:

- the stacking of modules
- finding the modules private data
- hide the ntvfs details from the calling layer
- I set NTVFS_INTERFACE_VERSION 0 till we are closer to release
  (because we need to solve some async problems with the module stacking)

metze
(This used to be commit 3ff03b5cb21bb79afdd3b1609be9635f6688a539)

1 files changed, 3 insertions, 16 deletions

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 1f7df36a9b..c40633eb06 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -46,15 +46,9 @@ struct smbsrv_session {
 	struct auth_session_info *session_info;
 };
 
-
-/* each backend has to be one one of the following 3 basic types. In
- * earlier versions of Samba backends needed to handle all types, now
- * we implement them separately. */
-enum ntvfs_type {NTVFS_DISK, NTVFS_PRINT, NTVFS_IPC};
-
 /* we need a forward declaration of the ntvfs_ops strucutre to prevent
    include recursion */
-struct ntvfs_ops;
+struct ntvfs_context;
 
 struct smbsrv_tcon {
 	struct smbsrv_tcon *next, *prev;
@@ -62,17 +56,13 @@ struct smbsrv_tcon {
 	/* the server context that this was created on */
 	struct smbsrv_connection *smb_conn;
 
-	/* an array of private structures used by the active NTVFS backends */
-	void **ntvfs_private_list;
-
 	uint16_t cnum; /* an index passed over the wire (the TID) */
 	int service;
-	enum ntvfs_type type;
 	BOOL read_only;
 	BOOL admin_user;
 
-	/* the NTVFS operations - see source/ntvfs/ and include/ntvfs.h for details */
-	const struct ntvfs_ops *ntvfs_ops;
+	/* the NTVFS context - see source/ntvfs/ for details */
+	struct ntvfs_context *ntvfs_ctx;
 
 	/* the reported filesystem type */
 	char *fs_type;
@@ -93,9 +83,6 @@ struct smbsrv_request {
 	/* the session context is derived from the vuid */
 	struct smbsrv_session *session;
 
-	/* the ntvfs chaining depth */
-	int ntvfs_depth;
-
 	/* a set of flags to control usage of the request. See REQ_CONTROL_* */
 	unsigned control_flags;