r14464: Don't include ndr_BASENAME.h files unless strictly required, instead

[kai/samba.git] / source4 / ntvfs / posix / vfs_posix.h

diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 3219631ebb3f105abf077c3b5774f5ff1af4e9bb..71120965c2fcf5f2588d7c89f440dea21f0c621f 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -23,7 +23,7 @@
 #ifndef _VFS_POSIX_H_
 #define _VFS_POSIX_H_
 
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
 #include "system/filesys.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
@@ -31,7 +31,7 @@
 /* this is the private structure for the posix vfs backend. It is used
    to hold per-connection (per tree connect) state information */
 struct pvfs_state {
-       struct smbsrv_tcon *tcon;
+       struct ntvfs_module_context *ntvfs;
        const char *base_directory;
        struct GUID *base_fs_uuid;
 
@@ -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_ */