{
int ret;
struct timespec mtime;
+ NTSTATUS status;
if (data->fsp) {
- ret = fsp_stat(data->fsp);
+ status = vfs_stat_fsp(data->fsp);
+ if (!NT_STATUS_IS_OK(status)) {
+ return false;
+ }
mtime = data->fsp->fsp_name->st.st_ex_mtime;
} else {
ret = SMB_VFS_STAT(handle->conn, data->smb_fname);
+ if (ret == -1) {
+ return false;
+ }
mtime = data->smb_fname->st.st_ex_mtime;
}
- if (ret == -1) {
- return false;
- }
-
*ret_mtime = mtime;
return true;
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;
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->fsp, data->source_directory);
+ 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;
- data->number_of_entries = i;
+ total_count++;
+ dp = SMB_VFS_NEXT_READDIR(handle,
+ data->fsp,
+ data->source_directory);
+ } while (dp != NULL);
+
+ data->number_of_entries = total_count;
/* Sort the directory entries by name */
TYPESAFE_QSORT(data->directory_list, data->number_of_entries, compare_dirent);
return true;
}
-static DIR *dirsort_opendir(vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- const char *mask,
- uint32_t attr)
-{
- struct dirsort_privates *list_head = NULL;
- struct dirsort_privates *data = NULL;
-
- if (SMB_VFS_HANDLE_TEST_DATA(handle)) {
- /* Find the list head of all open directories. */
- SMB_VFS_HANDLE_GET_DATA(handle, list_head, struct dirsort_privates,
- return NULL);
- }
-
- /* set up our private data about this directory */
- data = talloc_zero(handle->conn, struct dirsort_privates);
- if (!data) {
- return NULL;
- }
-
- data->smb_fname = cp_smb_filename(data, smb_fname);
- if (data->smb_fname == NULL) {
- TALLOC_FREE(data);
- return NULL;
- }
-
- /* Open the underlying directory and count the number of entries */
- data->source_directory = SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask,
- attr);
-
- if (data->source_directory == NULL) {
- TALLOC_FREE(data);
- return NULL;
- }
-
- if (!open_and_sort_dir(handle, data)) {
- SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
- TALLOC_FREE(data);
- return NULL;
- }
-
- /* Add to the private list of all open directories. */
- DLIST_ADD(list_head, data);
- SMB_VFS_HANDLE_SET_DATA(handle, list_head, NULL,
- struct dirsort_privates, return NULL);
-
- return data->source_directory;
-}
-
static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
files_struct *fsp,
const char *mask,
SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
TALLOC_FREE(data);
/* fd is now closed. */
- fsp->fh->fd = -1;
+ fsp_set_fd(fsp, -1);
return NULL;
}
}
static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
- DIR *dirp,
- SMB_STRUCT_STAT *sbuf)
+ struct files_struct *dirfsp,
+ DIR *dirp)
{
struct dirsort_privates *data = NULL;
struct timespec current_mtime;
return &data->directory_list[data->pos++];
}
-static void dirsort_seekdir(vfs_handle_struct *handle, DIR *dirp,
- long offset)
-{
- struct timespec current_mtime;
- struct dirsort_privates *data = NULL;
-
- SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, return);
-
- /* Find the entry holding dirp. */
- while(data && (data->source_directory != dirp)) {
- data = data->next;
- }
- if (data == NULL) {
- return;
- }
- if (offset >= data->number_of_entries) {
- return;
- }
- data->pos = offset;
-
- if (get_sorted_dir_mtime(handle, data, ¤t_mtime) == false) {
- return;
- }
-
- if (timespec_compare(¤t_mtime, &data->mtime)) {
- /* Directory changed. We must re-read the
- cache and search for the name that was
- previously stored at the offset being
- requested, otherwise after the re-sort
- we will point to the wrong entry. The
- OS/2 incremental delete code relies on
- this. */
- unsigned int i;
- char *wanted_name = talloc_strdup(handle->conn,
- data->directory_list[offset].d_name);
- if (wanted_name == NULL) {
- return;
- }
- SMB_VFS_NEXT_REWINDDIR(handle, data->source_directory);
- open_and_sort_dir(handle, data);
- /* Now search for where we were. */
- data->pos = 0;
- for (i = 0; i < data->number_of_entries; i++) {
- if(strcmp(wanted_name, data->directory_list[i].d_name) == 0) {
- data->pos = i;
- break;
- }
- }
- TALLOC_FREE(wanted_name);
- }
-}
-
-static long dirsort_telldir(vfs_handle_struct *handle, DIR *dirp)
-{
- struct dirsort_privates *data = NULL;
- SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
- return -1);
-
- /* Find the entry holding dirp. */
- while(data && (data->source_directory != dirp)) {
- data = data->next;
- }
- if (data == NULL) {
- return -1;
- }
- return data->pos;
-}
-
static void dirsort_rewinddir(vfs_handle_struct *handle, DIR *dirp)
{
struct dirsort_privates *data = NULL;
}
static struct vfs_fn_pointers vfs_dirsort_fns = {
- .opendir_fn = dirsort_opendir,
.fdopendir_fn = dirsort_fdopendir,
.readdir_fn = dirsort_readdir,
- .seekdir_fn = dirsort_seekdir,
- .telldir_fn = dirsort_telldir,
.rewind_dir_fn = dirsort_rewinddir,
.closedir_fn = dirsort_closedir,
};
static_decl_vfs;
-NTSTATUS vfs_dirsort_init(void)
+NTSTATUS vfs_dirsort_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "dirsort",
&vfs_dirsort_fns);
git.samba.org / samba.git / blobdiff