diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 18:27:29 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 18:27:29 +0100 |
| commit | fc6bc92e116d3891671a77bc4564047eefd69f95 (patch) | |
| tree | 9fd31f538af9cea9f144ece7e7b7cd2333d2bd81 /source4/ntvfs/sysdep/inotify.c | |
| parent | d70eafc5c635255feafc7121b381e7044ac11854 (diff) | |
| parent | afe8e533b9626fff8c59653972019d3f91bf136c (diff) | |
| download | samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.gz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.xz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.zip | |
Merge branch 'v4-0-trivial' into v4-0-test
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)
Diffstat (limited to 'source4/ntvfs/sysdep/inotify.c')
| -rw-r--r-- | source4/ntvfs/sysdep/inotify.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index 3fa710415b..093c15abab 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -244,11 +244,6 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde, static NTSTATUS inotify_setup(struct sys_notify_context *ctx) { struct inotify_private *in; - - if (!lp_parm_bool(global_loadparm, NULL, "notify", "inotify", true)) { - return NT_STATUS_INVALID_SYSTEM_SERVICE; - } - in = talloc(ctx, struct inotify_private); NT_STATUS_HAVE_NO_MEMORY(in); in->fd = inotify_init(); @@ -339,6 +334,10 @@ static NTSTATUS inotify_watch(struct sys_notify_context *ctx, /* maybe setup the inotify fd */ if (ctx->private_data == NULL) { NTSTATUS status; + if (!lp_parm_bool(global_loadparm, NULL, "notify", "inotify", true)) { + return NT_STATUS_INVALID_SYSTEM_SERVICE; + } + status = inotify_setup(ctx); NT_STATUS_NOT_OK_RETURN(status); } |