summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-04-05 05:54:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:00:17 -0500
commit416d7b421001d00c4d494fceb4f2d0ab3e30cfaf (patch)
tree5551bf9f5e19d758417dff28b6b80fea16ad7b0c /source4/ntvfs/posix
parentbacf1152fc711560ed141fa8e6e470cbd9de6efc (diff)
downloadsamba-416d7b421001d00c4d494fceb4f2d0ab3e30cfaf.tar.gz
samba-416d7b421001d00c4d494fceb4f2d0ab3e30cfaf.tar.bz2
samba-416d7b421001d00c4d494fceb4f2d0ab3e30cfaf.zip
r14920: allow a notify backend to separately specify if it has handled the
given mask for the current directory and sub-directories. This allows us to setup the less efficient internal handling for subdirectories, while using the kernel inotify service for the current directory if available. It also allows inotify to handle only some of the filter bits, leaving the other filter bits for the user space handler. (This used to be commit 7c3d989fa44c7f57853a825337159f476d7dff80)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/pvfs_notify.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 121ba499b3..d2fdbfc49a 100644
--- a/source4/ntvfs/posix/pvfs_notify.c
+++ b/source4/ntvfs/posix/pvfs_notify.c
@@ -145,7 +145,11 @@ static NTSTATUS pvfs_notify_setup(struct pvfs_state *pvfs, struct pvfs_file *f,
e.filter = filter;
e.path = f->handle->name->full_name;
- e.recursive = recursive;
+ if (recursive) {
+ e.subdir_filter = filter;
+ } else {
+ e.subdir_filter = 0;
+ }
status = notify_add(pvfs->notify_context, &e,
pvfs_notify_callback, f->notify_buffer);