r21108: Send sys_notify_watch through the VFS, FAM is next

(This used to be commit 603a96761391f36ae9a1c8777d3333ab5c02eb34)

3 files changed, 9 insertions, 10 deletions

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 5c1143a28e..8719c83bba 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -400,7 +400,7 @@ char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)
 	return result;
 }
 
-struct sys_notify_context *sys_notify_context_create(struct share_params *scfg,
+struct sys_notify_context *sys_notify_context_create(connection_struct *conn,
 						     TALLOC_CTX *mem_ctx, 
 						     struct event_context *ev)
 {
@@ -412,6 +412,7 @@ struct sys_notify_context *sys_notify_context_create(struct share_params *scfg,
 	}
 
 	ctx->ev = ev;
+	ctx->conn = conn;
 	ctx->private_data = NULL;
 	return ctx;
 }
@@ -423,10 +424,7 @@ NTSTATUS sys_notify_watch(struct sys_notify_context *ctx,
 					   struct notify_event *ev),
 			  void *private_data, void *handle)
 {
-#ifdef HAVE_INOTIFY
-	return inotify_watch(ctx, e, callback, private_data, handle);
-#else
-	return NT_STATUS_OK;
-#endif
+	return SMB_VFS_NOTIFY_WATCH(ctx->conn, ctx, e, callback, private_data,
+				    handle);
 }
 
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 6d77ba4df6..506ad15b71 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -73,11 +73,12 @@ static int notify_destructor(struct notify_context *notify)
 struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server, 
 				   struct messaging_context *messaging_ctx,
 				   struct event_context *ev,
-				   struct share_params *scfg)
+				   connection_struct *conn)
 {
 	struct notify_context *notify;
 
-	if (!lp_parm_bool(scfg->service, "notify", "enable", True)) {
+	if (!lp_parm_bool(conn->params->service, "notify", "enable",
+			  True)) {
 		return NULL;
 	}
 
@@ -107,7 +108,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server,
 	messaging_register(notify->messaging_ctx, notify, 
 			   MSG_PVFS_NOTIFY, notify_handler);
 
-	notify->sys_notify_ctx = sys_notify_context_create(scfg, notify, ev);
+	notify->sys_notify_ctx = sys_notify_context_create(conn, notify, ev);
 
 	return notify;
 }
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 8dbcc2b5ab..c3bc89ec0d 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -950,7 +950,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
 		conn->notify_ctx = notify_init(conn->mem_ctx, server_id_self(),
 					       smbd_messaging_context(),
 					       smbd_event_context(),
-					       conn->params);
+					       conn);
 	}
 
 /* ROOT Activities: */