X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fmodules%2Fonefs.h;h=b12a67e36720a1f44cc1572918510a98b8b65bc4;hb=bfe4a2baeec6bc4558a617ec67532ea11f865861;hp=70f90b5cd5e24edb44fb15089406353614d24ce7;hpb=ba95882155db4f8c10725f47f70ae482d5343f9a;p=samba.git

diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index 70f90b5cd5e..b12a67e3672 100644
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -24,30 +24,29 @@
 /*
  * vfs interface handlers
  */
-SMB_STRUCT_DIR *onefs_opendir(struct vfs_handle_struct *handle,
+DIR *onefs_opendir(struct vfs_handle_struct *handle,
 			      const char *fname, const char *mask,
 			      uint32 attributes);
 
-SMB_STRUCT_DIRENT *onefs_readdir(struct vfs_handle_struct *handle,
-				 SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf);
+struct dirent *onefs_readdir(struct vfs_handle_struct *handle,
+				 DIR *dirp, SMB_STRUCT_STAT *sbuf);
 
-void onefs_seekdir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
+void onefs_seekdir(struct vfs_handle_struct *handle, DIR *dirp,
 		   long offset);
 
-long onefs_telldir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+long onefs_telldir(struct vfs_handle_struct *handle, DIR *dirp);
 
-void onefs_rewinddir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+void onefs_rewinddir(struct vfs_handle_struct *handle, DIR *dirp);
 
-int onefs_closedir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dir);
+int onefs_closedir(struct vfs_handle_struct *handle, DIR *dir);
 
 void onefs_init_search_op(struct vfs_handle_struct *handle,
-			  SMB_STRUCT_DIR *dirp);
+			  DIR *dirp);
 
 NTSTATUS onefs_create_file(vfs_handle_struct *handle,
 			   struct smb_request *req,
 			   uint16_t root_dir_fid,
-			   const char *fname,
-			   uint32_t create_file_flags,
+			   struct smb_filename *smb_fname,
 			   uint32_t access_mask,
 			   uint32_t share_access,
 			   uint32_t create_disposition,
@@ -58,27 +57,23 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
 			   struct security_descriptor *sd,
 			   struct ea_list *ea_list,
 			   files_struct **result,
-			   int *pinfo,
-			   SMB_STRUCT_STAT *psbuf);
+			   int *pinfo);
 
 int onefs_close(vfs_handle_struct *handle, struct files_struct *fsp);
 
-int onefs_rename(vfs_handle_struct *handle, const char *oldname,
-		 const char *newname);
+int onefs_rename(vfs_handle_struct *handle,
+		 const struct smb_filename *smb_fname_src,
+		 const struct smb_filename *smb_fname_dst);
 
-int onefs_stat(vfs_handle_struct *handle, const char *fname,
-	       SMB_STRUCT_STAT *sbuf);
+int onefs_stat(vfs_handle_struct *handle, struct smb_filename *smb_fname);
 
 int onefs_fstat(vfs_handle_struct *handle, struct files_struct *fsp,
 		SMB_STRUCT_STAT *sbuf);
 
-int onefs_lstat(vfs_handle_struct *handle, const char *path,
-		SMB_STRUCT_STAT *sbuf);
-
-int onefs_unlink(vfs_handle_struct *handle, const char *path);
+int onefs_lstat(vfs_handle_struct *handle, struct smb_filename *smb_fname);
 
-int onefs_chflags(vfs_handle_struct *handle, const char *path,
-		  unsigned int flags);
+int onefs_unlink(vfs_handle_struct *handle,
+		 const struct smb_filename *smb_fname);
 
 NTSTATUS onefs_streaminfo(vfs_handle_struct *handle,
 			  struct files_struct *fsp,
@@ -87,7 +82,8 @@ NTSTATUS onefs_streaminfo(vfs_handle_struct *handle,
 			  unsigned int *num_streams,
 			  struct stream_struct **streams);
 
-int onefs_vtimes_streams(vfs_handle_struct *handle, const char *fname,
+int onefs_vtimes_streams(vfs_handle_struct *handle,
+			 const struct smb_filename *smb_fname,
 			 int flags, struct timespec times[3]);
 
 NTSTATUS onefs_brl_lock_windows(vfs_handle_struct *handle,
@@ -124,26 +120,29 @@ NTSTATUS onefs_notify_watch(vfs_handle_struct *vfs_handle,
 			    void *handle_p);
 
 NTSTATUS onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-			   uint32 security_info, SEC_DESC **ppdesc);
+			   uint32 security_info, struct security_descriptor **ppdesc);
 
 NTSTATUS onefs_get_nt_acl(vfs_handle_struct *handle, const char* name,
-			  uint32 security_info, SEC_DESC **ppdesc);
+			  uint32 security_info, struct security_descriptor **ppdesc);
 
 NTSTATUS onefs_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-			   uint32 security_info_sent, SEC_DESC *psd);
+			   uint32 security_info_sent,
+			   const struct security_descriptor *psd);
 
 /*
  * Utility functions
  */
 struct ifs_security_descriptor;
-NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, SEC_DESC *psd,
+NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent,
+			      const struct security_descriptor *psd,
 			      struct ifs_security_descriptor *sd, int snum,
 			      uint32_t *security_info_effective);
 
-NTSTATUS onefs_split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname,
-				      char **pbase, char **pstream);
+NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx,
+				     const struct smb_filename *smb_fname_in,
+				     struct smb_filename **smb_fname_out);
 
-int onefs_rdp_add_dir_state(connection_struct *conn, SMB_STRUCT_DIR *dirp);
+int onefs_rdp_add_dir_state(connection_struct *conn, DIR *dirp);
 
 /*
  * System Interfaces
@@ -164,10 +163,10 @@ int onefs_sys_create_file(connection_struct *conn,
 			  int *granted_oplock);
 
 ssize_t onefs_sys_sendfile(connection_struct *conn, int tofd, int fromfd,
-			   const DATA_BLOB *header, SMB_OFF_T offset,
+			   const DATA_BLOB *header, off_t offset,
 			   size_t count);
 
-ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T offset,
+ssize_t onefs_sys_recvfile(int fromfd, int tofd, off_t offset,
 			   size_t count);
 
 void init_stat_ex_from_onefs_stat(struct stat_ex *dst, const struct stat *src);