diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-29 08:48:57 +1100 |
| commit | 3eef0664c59c7afef117132c1d2ebccf22ad748e (patch) | |
| tree | 17f4ae2a47cc7d3bac266f5ca2033140e6a4e81e /source4/ntvfs/sysdep/inotify.c | |
| parent | 3abf47fe87e72b18c94157c3f993b7f2fca8c248 (diff) | |
| parent | 2ba62662f8e2578153be3125eb557b9349ccfd3b (diff) | |
| download | samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.gz samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.tar.bz2 samba-3eef0664c59c7afef117132c1d2ebccf22ad748e.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 04db9b184491415b3479fd79e1c07ba738818eb9)
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); } |