sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r14918: cleaner handling of systems without inotify

Browse Source 
(This used to be commit cf17ff15b15942f0ce068dd0a94b3b565a9b93cb)
This commit is contained in:
Andrew Tridgell 2006-04-05 04:50:08 +00:00 committed by Gerald (Jerry) Carter
parent 66a0d69256
commit a9cb173f76
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source4/ntvfs/common/notify.c
View File

@ -267,6 +267,25 @@ static void sys_notify_callback(struct sys_notify_context *ctx,
listel->callback(listel->private, ev);
}
/*
add an entry to the notify array
*/
static NTSTATUS notify_add_array(struct notify_context *notify, struct notify_entry *e,
const char *path, void *private)
{
notify->array->entries[notify->array->num_entries] = *e;
notify->array->entries[notify->array->num_entries].private = private;
notify->array->entries[notify->array->num_entries].server = notify->server;
if (path) {
notify->array->entries[notify->array->num_entries].path = path;
}
notify->array->num_entries++;
return notify_save(notify);
}
/*
add a notify watch. This is called when a notify is first setup on a open
directory handle.
@ -312,33 +331,23 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e,
DLIST_ADD(notify->list, listel);
/* ignore failures from sys_notify */
status = sys_notify_watch(notify->sys_notify_ctx, e->path, e->filter,
sys_notify_callback, listel,
&listel->sys_notify_handle);
if (NT_STATUS_IS_OK(status)) {
talloc_steal(listel, listel->sys_notify_handle);
notify_unlock(notify);
} else {
notify->array->entries[notify->array->num_entries] = *e;
notify->array->entries[notify->array->num_entries].private = private;
notify->array->entries[notify->array->num_entries].server = notify->server;
if (path) {
notify->array->entries[notify->array->num_entries].path = path;
if (notify->sys_notify_ctx != NULL) {
status = sys_notify_watch(notify->sys_notify_ctx, e->path, e->filter,
sys_notify_callback, listel,
&listel->sys_notify_handle);
if (NT_STATUS_IS_OK(status)) {
/* if the kernel handler has said it can handle this notify then
we don't need to add it to the array */
talloc_steal(listel, listel->sys_notify_handle);
goto done;
}
notify->array->num_entries++;
status = notify_save(notify);
notify_unlock(notify);
NT_STATUS_NOT_OK_RETURN(status);
}
if (path) {
talloc_free(path);
}
status = notify_add_array(notify, e, path, private);
done:
notify_unlock(notify);
talloc_free(path);
return status;
}

2
source4/ntvfs/sysdep/inotify.c
View File

@ -239,7 +239,7 @@ static int watch_destructor(void *ptr)
/*
add a watch. The watch is removed when the caller calls
talloc_free() on handle
talloc_free() on *handle
*/
static NTSTATUS inotify_watch(struct sys_notify_context *ctx, const char *dirpath,
uint32_t filter, sys_notify_callback_t callback,

4
source4/ntvfs/sysdep/sys_notify.c
View File

@ -44,6 +44,10 @@ struct sys_notify_context *sys_notify_init(int snum,
const char *bname;
struct sys_notify_backend *b;
if (backends == NULL) {
return NULL;
}
if (ev == NULL) {
ev = event_context_find(mem_ctx);
}