s3: VFS: Remove fsync_fn() from the VFS and all modules. VFS ABI change.

[samba.git] / source3 / modules / vfs_dirsort.c

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index d6b33941fad67a13d7a4719e735f6ff98d2368aa..c23f6f0152d4ce34c5a57550f1e303e09a20b25e 100644 (file)
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -65,8 +65,10 @@ static bool get_sorted_dir_mtime(vfs_handle_struct *handle,
 static bool open_and_sort_dir(vfs_handle_struct *handle,
                                struct dirsort_privates *data)
 {
-       unsigned int i = 0;
-       unsigned int total_count = 0;
+       uint32_t total_count = 0;
+       /* This should be enough for most use cases */
+       uint32_t dirent_allocated = 64;
+       struct dirent *dp;
 
        data->number_of_entries = 0;
 
@@ -74,38 +76,51 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
                return false;
        }
 
-       while (SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL)
-              != NULL) {
-               total_count++;
-       }
-
-       if (total_count == 0) {
+       dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL);
+       if (dp == NULL) {
                return false;
        }
 
-       /* Open the underlying directory and count the number of entries
-          Skip back to the beginning as we'll read it again */
-       SMB_VFS_NEXT_REWINDDIR(handle, data->source_directory);
-
        /* Set up an array and read the directory entries into it */
        TALLOC_FREE(data->directory_list); /* destroy previous cache if needed */
        data->directory_list = talloc_zero_array(data,
-                                       struct dirent,
-                                       total_count);
-       if (!data->directory_list) {
+                                                struct dirent,
+                                                dirent_allocated);
+       if (data->directory_list == NULL) {
                return false;
        }
-       for (i = 0; i < total_count; i++) {
-               struct dirent *dp = SMB_VFS_NEXT_READDIR(handle,
-                                               data->source_directory,
-                                               NULL);
-               if (dp == NULL) {
-                       break;
+
+       do {
+               if (total_count >= dirent_allocated) {
+                       struct dirent *dlist;
+
+                       /*
+                        * Be memory friendly.
+                        *
+                        * We should not double the amount of memory. With a lot
+                        * of files we reach easily 50MB, and doubling will
+                        * get much bigger just for a few files more.
+                        *
+                        * For 200k files this means 50 memory reallocations.
+                        */
+                       dirent_allocated += 4096;
+
+                       dlist = talloc_realloc(data,
+                                              data->directory_list,
+                                              struct dirent,
+                                              dirent_allocated);
+                       if (dlist == NULL) {
+                               break;
+                       }
+                       data->directory_list = dlist;
                }
-               data->directory_list[i] = *dp;
-       }
+               data->directory_list[total_count] = *dp;
+
+               total_count++;
+               dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL);
+       } while (dp != NULL);
 
-       data->number_of_entries = i;
+       data->number_of_entries = total_count;
 
        /* Sort the directory entries by name */
        TYPESAFE_QSORT(data->directory_list, data->number_of_entries, compare_dirent);
@@ -113,8 +128,9 @@ static bool open_and_sort_dir(vfs_handle_struct *handle,
 }
 
 static DIR *dirsort_opendir(vfs_handle_struct *handle,
-                                      const char *fname, const char *mask,
-                                      uint32 attr)
+                               const struct smb_filename *smb_fname,
+                               const char *mask,
+                               uint32_t attr)
 {
        struct dirsort_privates *list_head = NULL;
        struct dirsort_privates *data = NULL;
@@ -131,14 +147,26 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
                return NULL;
        }
 
-       data->smb_fname = synthetic_smb_fname(data, fname, NULL, NULL);
+       data->smb_fname = cp_smb_filename(data, smb_fname);
        if (data->smb_fname == NULL) {
                TALLOC_FREE(data);
                return NULL;
        }
 
+       if (ISDOT(data->smb_fname->base_name)) {
+               struct smb_filename *cwd_fname = vfs_GetWd(data, handle->conn);
+               if (cwd_fname == NULL) {
+                       TALLOC_FREE(data);
+                       return NULL;
+               }
+               TALLOC_FREE(data->smb_fname->base_name);
+               data->smb_fname->base_name = talloc_move(data->smb_fname,
+                                               &cwd_fname->base_name);
+               TALLOC_FREE(cwd_fname);
+       }
+
        /* Open the underlying directory and count the number of entries */
-       data->source_directory = SMB_VFS_NEXT_OPENDIR(handle, fname, mask,
+       data->source_directory = SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask,
                                                      attr);
 
        if (data->source_directory == NULL) {
@@ -163,7 +191,7 @@ static DIR *dirsort_opendir(vfs_handle_struct *handle,
 static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
                                        files_struct *fsp,
                                        const char *mask,
-                                       uint32 attr)
+                                       uint32_t attr)
 {
        struct dirsort_privates *list_head = NULL;
        struct dirsort_privates *data = NULL;
@@ -358,7 +386,8 @@ static struct vfs_fn_pointers vfs_dirsort_fns = {
        .closedir_fn = dirsort_closedir,
 };
 
-NTSTATUS vfs_dirsort_init(void)
+static_decl_vfs;
+NTSTATUS vfs_dirsort_init(TALLOC_CTX *ctx)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "dirsort",
                                &vfs_dirsort_fns);