From bad8c39f1ce48229c1ca545c03de6b7c26b7ba9f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 1 Feb 2007 15:11:06 +0000 Subject: r21111: Reorganize the change notify params a bit. We now have the per-share parameters change notify = [yes]/no # do we do it at all kernel change notify = [yes]/no # enable/disable inotify Those who want FAM need to say change notify = yes vfs objects = notify_fam Volker (This used to be commit c3a44d8b9606fc516faceb69b8e87bfc8be312f3) --- source3/modules/vfs_default.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 0efffe154d..458618ee0b 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -842,10 +842,14 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle, void *private_data, void *handle) { #ifdef HAVE_INOTIFY - return inotify_watch(ctx, e, callback, private_data, handle); -#else - return NT_STATUS_OK; + if (lp_kernel_change_notify(ctx->conn->params)) { + return inotify_watch(ctx, e, callback, private_data, handle); + } #endif + /* + * Do nothing, leave everything to notify_internal.c + */ + return NT_STATUS_OK; } static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc) -- cgit