dlist: remove unneeded type argument from DLIST_ADD_END()
[samba.git] / source3 / smbd / notify.c
index 55009ce0b1c06d7d4f7b5fdb3aae4869b62205ad..d7382db69381a7a442fe55420c4a9869956686ac 100644 (file)
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
+#include "../librpc/gen_ndr/ndr_notify.h"
+#include "librpc/gen_ndr/ndr_file_id.h"
+
+struct notify_change_event {
+       struct timespec when;
+       uint32_t action;
+       const char *name;
+};
+
+struct notify_change_buf {
+       /*
+        * If no requests are pending, changes are queued here. Simple array,
+        * we only append.
+        */
+
+       /*
+        * num_changes == -1 means that we have got a catch-all change, when
+        * asked we just return NT_STATUS_OK without specific changes.
+        */
+       int num_changes;
+       struct notify_change_event *changes;
+
+       /*
+        * If no changes are around requests are queued here. Using a linked
+        * list, because we have to append at the end and delete from the top.
+        */
+       struct notify_change_request *requests;
+};
 
 struct notify_change_request {
        struct notify_change_request *prev, *next;
        struct files_struct *fsp;       /* backpointer for cancel by mid */
-       uint8 request_buf[smb_size];
-       uint32 filter;
-       uint32 max_param;
+       struct smb_request *req;
+       uint32_t filter;
+       uint32_t max_param;
+       void (*reply_fn)(struct smb_request *req,
+                        NTSTATUS error_code,
+                        uint8_t *buf, size_t len);
        struct notify_mid_map *mid_map;
        void *backend_data;
 };
 
-static void notify_fsp(files_struct *fsp, uint32 action, const char *name);
+static void notify_fsp(files_struct *fsp, struct timespec when,
+                      uint32_t action, const char *name);
+
+bool change_notify_fsp_has_changes(struct files_struct *fsp)
+{
+       if (fsp == NULL) {
+               return false;
+       }
+
+       if (fsp->notify == NULL) {
+               return false;
+       }
 
-static struct notify_mid_map *notify_changes_by_mid;
+       if (fsp->notify->num_changes == 0) {
+               return false;
+       }
+
+       return true;
+}
 
 /*
  * For NTCancel, we need to find the notify_change_request indexed by
@@ -43,11 +92,11 @@ static struct notify_mid_map *notify_changes_by_mid;
 struct notify_mid_map {
        struct notify_mid_map *prev, *next;
        struct notify_change_request *req;
-       uint16 mid;
+       uint64_t mid;
 };
 
-static bool notify_change_record_identical(struct notify_change *c1,
-                                       struct notify_change *c2)
+static bool notify_change_record_identical(struct notify_change_event *c1,
+                                          struct notify_change_event *c2)
 {
        /* Note this is deliberately case sensitive. */
        if (c1->action == c2->action &&
@@ -57,21 +106,39 @@ static bool notify_change_record_identical(struct notify_change *c1,
        return False;
 }
 
+static int compare_notify_change_events(const void *p1, const void *p2)
+{
+       const struct notify_change_event *e1 = p1;
+       const struct notify_change_event *e2 = p2;
+
+       return timespec_compare(&e1->when, &e2->when);
+}
+
 static bool notify_marshall_changes(int num_changes,
-                               uint32 max_offset,
-                               struct notify_change *changes,
-                               prs_struct *ps)
+                               uint32_t max_offset,
+                               struct notify_change_event *changes,
+                               DATA_BLOB *final_blob)
 {
        int i;
-       UNISTR uni_name;
 
-       uni_name.buffer = NULL;
+       if (num_changes == -1) {
+               return false;
+       }
+
+       /*
+        * Sort the notifies by timestamp when the event happened to avoid
+        * coalescing and thus dropping events.
+        */
+
+       qsort(changes, num_changes,
+             sizeof(*changes), compare_notify_change_events);
 
        for (i=0; i<num_changes; i++) {
-               struct notify_change *c;
-               size_t namelen;
-               uint32 u32_tmp; /* Temp arg to prs_uint32 to avoid
-                                * signed/unsigned issues */
+               enum ndr_err_code ndr_err;
+               struct notify_change_event *c;
+               struct FILE_NOTIFY_INFORMATION m;
+               DATA_BLOB blob;
+               uint16_t pad = 0;
 
                /* Coalesce any identical records. */
                while (i+1 < num_changes &&
@@ -82,209 +149,194 @@ static bool notify_marshall_changes(int num_changes,
 
                c = &changes[i];
 
-               namelen = convert_string_allocate(
-                       NULL, CH_UNIX, CH_UTF16LE, c->name, strlen(c->name)+1,
-                       &uni_name.buffer, True);
-               if ((namelen == -1) || (uni_name.buffer == NULL)) {
-                       goto fail;
-               }
+               m.FileName1 = c->name;
+               m.FileNameLength = strlen_m(c->name)*2;
+               m.Action = c->action;
 
-               namelen -= 2;   /* Dump NULL termination */
+               m._pad = data_blob_null;
 
                /*
                 * Offset to next entry, only if there is one
                 */
 
-               u32_tmp = (i == num_changes-1) ? 0 : namelen + 12;
-               if (!prs_uint32("offset", ps, 1, &u32_tmp)) goto fail;
-
-               u32_tmp = c->action;
-               if (!prs_uint32("action", ps, 1, &u32_tmp)) goto fail;
+               if (i == (num_changes-1)) {
+                       m.NextEntryOffset = 0;
+               } else {
+                       if ((m.FileNameLength % 4) == 2) {
+                               m._pad = data_blob_const(&pad, 2);
+                       }
+                       m.NextEntryOffset =
+                               ndr_size_FILE_NOTIFY_INFORMATION(&m, 0);
+               }
 
-               u32_tmp = namelen;
-               if (!prs_uint32("namelen", ps, 1, &u32_tmp)) goto fail;
+               ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), &m,
+                       (ndr_push_flags_fn_t)ndr_push_FILE_NOTIFY_INFORMATION);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       return false;
+               }
 
-               if (!prs_unistr("name", ps, 1, &uni_name)) goto fail;
+               if (DEBUGLEVEL >= 10) {
+                       NDR_PRINT_DEBUG(FILE_NOTIFY_INFORMATION, &m);
+               }
 
-               /*
-                * Not NULL terminated, decrease by the 2 UCS2 \0 chars
-                */
-               prs_set_offset(ps, prs_offset(ps)-2);
+               if (!data_blob_append(talloc_tos(), final_blob,
+                                     blob.data, blob.length)) {
+                       data_blob_free(&blob);
+                       return false;
+               }
 
-               SAFE_FREE(uni_name.buffer);
+               data_blob_free(&blob);
 
-               if (prs_offset(ps) > max_offset) {
+               if (final_blob->length > max_offset) {
                        /* Too much data for client. */
+                       DEBUG(10, ("Client only wanted %d bytes, trying to "
+                                  "marshall %d bytes\n", (int)max_offset,
+                                  (int)final_blob->length));
                        return False;
                }
        }
 
        return True;
-
- fail:
-       SAFE_FREE(uni_name.buffer);
-       return False;
 }
 
 /****************************************************************************
  Setup the common parts of the return packet and send it.
 *****************************************************************************/
 
-static void change_notify_reply_packet(connection_struct *conn,
-                               const uint8 *request_buf,
-                                      NTSTATUS error_code)
+void change_notify_reply(struct smb_request *req,
+                        NTSTATUS error_code,
+                        uint32_t max_param,
+                        struct notify_change_buf *notify_buf,
+                        void (*reply_fn)(struct smb_request *req,
+                                         NTSTATUS error_code,
+                                         uint8_t *buf, size_t len))
 {
-       char outbuf[smb_size+38];
+       DATA_BLOB blob = data_blob_null;
 
-       memset(outbuf, '\0', sizeof(outbuf));
-       construct_reply_common((char *)request_buf, outbuf);
-
-       ERROR_NT(error_code);
-
-       /*
-        * Seems NT needs a transact command with an error code
-        * in it. This is a longer packet than a simple error.
-        */
-       srv_set_message(outbuf,18,0,False);
-
-       show_msg(outbuf);
-       if (!srv_send_smb(smbd_server_fd(),
-                       outbuf,
-                       IS_CONN_ENCRYPTED(conn)))
-               exit_server_cleanly("change_notify_reply_packet: srv_send_smb "
-                                   "failed.");
-}
-
-void change_notify_reply(connection_struct *conn,
-                       const uint8 *request_buf, uint32 max_param,
-                        struct notify_change_buf *notify_buf)
-{
-       prs_struct ps;
-       struct smb_request *req = NULL;
-       uint8 tmp_request[smb_size];
-
-       if (notify_buf->num_changes == -1) {
-               change_notify_reply_packet(conn, request_buf, NT_STATUS_OK);
-               notify_buf->num_changes = 0;
+       if (!NT_STATUS_IS_OK(error_code)) {
+               reply_fn(req, error_code, NULL, 0);
                return;
        }
 
-       prs_init(&ps, 0, NULL, MARSHALL);
+       if (max_param == 0 || notify_buf == NULL) {
+               reply_fn(req, NT_STATUS_OK, NULL, 0);
+               return;
+       }
 
        if (!notify_marshall_changes(notify_buf->num_changes, max_param,
-                                       notify_buf->changes, &ps)) {
+                                       notify_buf->changes, &blob)) {
                /*
                 * We exceed what the client is willing to accept. Send
                 * nothing.
                 */
-               change_notify_reply_packet(conn, request_buf, NT_STATUS_OK);
-               goto done;
-       }
-
-       if (!(req = talloc(talloc_tos(), struct smb_request))) {
-               change_notify_reply_packet(conn, request_buf, NT_STATUS_NO_MEMORY);
-               goto done;
+               data_blob_free(&blob);
        }
 
-       memcpy(tmp_request, request_buf, smb_size);
-
-       /*
-        * We're only interested in the header fields here
-        */
-
-       smb_setlen((char *)tmp_request, smb_size);
-       SCVAL(tmp_request, smb_wct, 0);
+       reply_fn(req, NT_STATUS_OK, blob.data, blob.length);
 
-       init_smb_request(req, tmp_request,0, conn->encrypted_tid);
-
-       send_nt_replies(conn, req, NT_STATUS_OK, prs_data_p(&ps),
-                       prs_offset(&ps), NULL, 0);
-
- done:
-       TALLOC_FREE(req);
-       prs_mem_free(&ps);
+       data_blob_free(&blob);
 
        TALLOC_FREE(notify_buf->changes);
        notify_buf->num_changes = 0;
 }
 
-static void notify_callback(void *private_data, const struct notify_event *e)
+static void notify_callback(void *private_data, struct timespec when,
+                           const struct notify_event *e)
 {
        files_struct *fsp = (files_struct *)private_data;
-       DEBUG(10, ("notify_callback called for %s\n", fsp->fsp_name));
-       notify_fsp(fsp, e->action, e->path);
+       DEBUG(10, ("notify_callback called for %s\n", fsp_str_dbg(fsp)));
+       notify_fsp(fsp, when, e->action, e->path);
 }
 
-NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
+NTSTATUS change_notify_create(struct files_struct *fsp, uint32_t filter,
                              bool recursive)
 {
        char *fullpath;
-       struct notify_entry e;
-       NTSTATUS status;
-
-       SMB_ASSERT(fsp->notify == NULL);
+       size_t len;
+       uint32_t subdir_filter;
+       NTSTATUS status = NT_STATUS_NOT_IMPLEMENTED;
+
+       if (fsp->notify != NULL) {
+               DEBUG(1, ("change_notify_create: fsp->notify != NULL, "
+                         "fname = %s\n", fsp->fsp_name->base_name));
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 
-       if (!(fsp->notify = TALLOC_ZERO_P(NULL, struct notify_change_buf))) {
+       if (!(fsp->notify = talloc_zero(NULL, struct notify_change_buf))) {
                DEBUG(0, ("talloc failed\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (asprintf(&fullpath, "%s/%s", fsp->conn->connectpath,
-                    fsp->fsp_name) == -1) {
-               DEBUG(0, ("asprintf failed\n"));
+       /* Do notify operations on the base_name. */
+       fullpath = talloc_asprintf(
+               talloc_tos(), "%s/%s", fsp->conn->connectpath,
+               fsp->fsp_name->base_name);
+       if (fullpath == NULL) {
+               DEBUG(0, ("talloc_asprintf failed\n"));
+               TALLOC_FREE(fsp->notify);
                return NT_STATUS_NO_MEMORY;
        }
 
-       ZERO_STRUCT(e);
-       e.path = fullpath;
-       e.filter = filter;
-       e.subdir_filter = 0;
-       if (recursive) {
-               e.subdir_filter = filter;
+       /*
+        * Avoid /. at the end of the path name. notify can't deal with it.
+        */
+       len = strlen(fullpath);
+       if (len > 1 && fullpath[len-1] == '.' && fullpath[len-2] == '/') {
+               fullpath[len-2] = '\0';
        }
 
-       status = notify_add(fsp->conn->notify_ctx, &e, notify_callback, fsp);
-       SAFE_FREE(fullpath);
+       subdir_filter = recursive ? filter : 0;
 
+       if ((filter != 0) || (subdir_filter != 0)) {
+               status = notify_add(fsp->conn->sconn->notify_ctx,
+                                   fullpath, filter, subdir_filter,
+                                   notify_callback, fsp);
+       }
+       TALLOC_FREE(fullpath);
        return status;
 }
 
-NTSTATUS change_notify_add_request(const struct smb_request *req,
-                               uint32 max_param,
-                               uint32 filter, bool recursive,
-                               struct files_struct *fsp)
+NTSTATUS change_notify_add_request(struct smb_request *req,
+                               uint32_t max_param,
+                               uint32_t filter, bool recursive,
+                               struct files_struct *fsp,
+                               void (*reply_fn)(struct smb_request *req,
+                                       NTSTATUS error_code,
+                                       uint8_t *buf, size_t len))
 {
        struct notify_change_request *request = NULL;
        struct notify_mid_map *map = NULL;
+       struct smbd_server_connection *sconn = req->sconn;
+
+       DEBUG(10, ("change_notify_add_request: Adding request for %s: "
+                  "max_param = %d\n", fsp_str_dbg(fsp), (int)max_param));
 
-       if (!(request = SMB_MALLOC_P(struct notify_change_request))
-           || !(map = SMB_MALLOC_P(struct notify_mid_map))) {
-               SAFE_FREE(request);
+       if (!(request = talloc(NULL, struct notify_change_request))
+           || !(map = talloc(request, struct notify_mid_map))) {
+               TALLOC_FREE(request);
                return NT_STATUS_NO_MEMORY;
        }
 
        request->mid_map = map;
        map->req = request;
 
-       memcpy(request->request_buf, req->inbuf, sizeof(request->request_buf));
+       request->req = talloc_move(request, &req);
        request->max_param = max_param;
        request->filter = filter;
        request->fsp = fsp;
+       request->reply_fn = reply_fn;
        request->backend_data = NULL;
 
-       DLIST_ADD_END(fsp->notify->requests, request,
-                     struct notify_change_request *);
+       DLIST_ADD_END(fsp->notify->requests, request);
 
-       map->mid = SVAL(req->inbuf, smb_mid);
-       DLIST_ADD(notify_changes_by_mid, map);
-
-       /* Push the MID of this packet on the signing queue. */
-       srv_defer_sign_response(SVAL(req->inbuf,smb_mid));
+       map->mid = request->req->mid;
+       DLIST_ADD(sconn->smb1.notify_mid_maps, map);
 
        return NT_STATUS_OK;
 }
 
-static void change_notify_remove_request(struct notify_change_request *remove_req)
+static void change_notify_remove_request(struct smbd_server_connection *sconn,
+                                        struct notify_change_request *remove_req)
 {
        files_struct *fsp;
        struct notify_change_request *req;
@@ -308,21 +360,45 @@ static void change_notify_remove_request(struct notify_change_request *remove_re
        }
 
        DLIST_REMOVE(fsp->notify->requests, req);
-       DLIST_REMOVE(notify_changes_by_mid, req->mid_map);
-       SAFE_FREE(req->mid_map);
-       TALLOC_FREE(req->backend_data);
-       SAFE_FREE(req);
+       DLIST_REMOVE(sconn->smb1.notify_mid_maps, req->mid_map);
+       TALLOC_FREE(req);
+}
+
+static void smbd_notify_cancel_by_map(struct notify_mid_map *map)
+{
+       struct smb_request *smbreq = map->req->req;
+       struct smbd_server_connection *sconn = smbreq->sconn;
+       struct smbd_smb2_request *smb2req = smbreq->smb2req;
+       NTSTATUS notify_status = NT_STATUS_CANCELLED;
+
+       if (smb2req != NULL) {
+               if (smb2req->session == NULL) {
+                       notify_status = STATUS_NOTIFY_CLEANUP;
+               } else if (!NT_STATUS_IS_OK(smb2req->session->status)) {
+                       notify_status = STATUS_NOTIFY_CLEANUP;
+               }
+               if (smb2req->tcon == NULL) {
+                       notify_status = STATUS_NOTIFY_CLEANUP;
+               } else if (!NT_STATUS_IS_OK(smb2req->tcon->status)) {
+                       notify_status = STATUS_NOTIFY_CLEANUP;
+               }
+       }
+
+       change_notify_reply(smbreq, notify_status,
+                           0, NULL, map->req->reply_fn);
+       change_notify_remove_request(sconn, map->req);
 }
 
 /****************************************************************************
  Delete entries by mid from the change notify pending queue. Always send reply.
 *****************************************************************************/
 
-void remove_pending_change_notify_requests_by_mid(uint16 mid)
+void remove_pending_change_notify_requests_by_mid(
+       struct smbd_server_connection *sconn, uint64_t mid)
 {
        struct notify_mid_map *map;
 
-       for (map = notify_changes_by_mid; map; map = map->next) {
+       for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
                if (map->mid == mid) {
                        break;
                }
@@ -332,9 +408,67 @@ void remove_pending_change_notify_requests_by_mid(uint16 mid)
                return;
        }
 
-       change_notify_reply_packet(map->req->fsp->conn,
-                       map->req->request_buf, NT_STATUS_CANCELLED);
-       change_notify_remove_request(map->req);
+       smbd_notify_cancel_by_map(map);
+}
+
+void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq)
+{
+       struct smbd_server_connection *sconn = smbreq->sconn;
+       struct notify_mid_map *map;
+
+       for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
+               if (map->req->req == smbreq) {
+                       break;
+               }
+       }
+
+       if (map == NULL) {
+               return;
+       }
+
+       smbd_notify_cancel_by_map(map);
+}
+
+static struct files_struct *smbd_notify_cancel_deleted_fn(
+       struct files_struct *fsp, void *private_data)
+{
+       struct file_id *fid = talloc_get_type_abort(
+               private_data, struct file_id);
+
+       if (file_id_equal(&fsp->file_id, fid)) {
+               remove_pending_change_notify_requests_by_fid(
+                       fsp, NT_STATUS_DELETE_PENDING);
+       }
+       return NULL;
+}
+
+void smbd_notify_cancel_deleted(struct messaging_context *msg,
+                               void *private_data, uint32_t msg_type,
+                               struct server_id server_id, DATA_BLOB *data)
+{
+       struct smbd_server_connection *sconn = talloc_get_type_abort(
+               private_data, struct smbd_server_connection);
+       struct file_id *fid;
+       enum ndr_err_code ndr_err;
+
+       fid = talloc(talloc_tos(), struct file_id);
+       if (fid == NULL) {
+               DEBUG(1, ("talloc failed\n"));
+               return;
+       }
+
+       ndr_err = ndr_pull_struct_blob_all(
+               data, fid, fid, (ndr_pull_flags_fn_t)ndr_pull_file_id);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(10, ("%s: ndr_pull_file_id failed: %s\n", __func__,
+                          ndr_errstr(ndr_err)));
+               goto done;
+       }
+
+       files_forall(sconn, smbd_notify_cancel_deleted_fn, fid);
+
+done:
+       TALLOC_FREE(fid);
 }
 
 /****************************************************************************
@@ -349,29 +483,30 @@ void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
        }
 
        while (fsp->notify->requests != NULL) {
-               change_notify_reply_packet(fsp->conn,
-                       fsp->notify->requests->request_buf, status);
-               change_notify_remove_request(fsp->notify->requests);
+               change_notify_reply(fsp->notify->requests->req,
+                                   status, 0, NULL,
+                                   fsp->notify->requests->reply_fn);
+               change_notify_remove_request(fsp->conn->sconn,
+                                            fsp->notify->requests);
        }
 }
 
-void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
+void notify_fname(connection_struct *conn, uint32_t action, uint32_t filter,
                  const char *path)
 {
-       char *fullpath;
+       struct notify_context *notify_ctx = conn->sconn->notify_ctx;
 
-       if (asprintf(&fullpath, "%s/%s", conn->connectpath, path) == -1) {
-               DEBUG(0, ("asprintf failed\n"));
-               return;
+       if (path[0] == '.' && path[1] == '/') {
+               path += 2;
        }
 
-       notify_trigger(conn->notify_ctx, action, filter, fullpath);
-       SAFE_FREE(fullpath);
+       notify_trigger(notify_ctx, action, filter, conn->connectpath, path);
 }
 
-static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
+static void notify_fsp(files_struct *fsp, struct timespec when,
+                      uint32_t action, const char *name)
 {
-       struct notify_change *change, *changes;
+       struct notify_change_event *change, *changes;
        char *tmp;
 
        if (fsp->notify == NULL) {
@@ -389,20 +524,36 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
        if ((fsp->notify->num_changes > 1000) || (name == NULL)) {
                /*
                 * The real number depends on the client buf, just provide a
-                * guard against a DoS here.
+                * guard against a DoS here.  If name == NULL the CN backend is
+                * alerting us to a problem.  Possibly dropped events.  Clear
+                * queued changes and send the catch-all response to the client
+                * if a request is pending.
                 */
                TALLOC_FREE(fsp->notify->changes);
                fsp->notify->num_changes = -1;
+               if (fsp->notify->requests != NULL) {
+                       change_notify_reply(fsp->notify->requests->req,
+                                           NT_STATUS_OK,
+                                           fsp->notify->requests->max_param,
+                                           fsp->notify,
+                                           fsp->notify->requests->reply_fn);
+                       change_notify_remove_request(fsp->conn->sconn,
+                                                    fsp->notify->requests);
+               }
                return;
        }
 
+       /* If we've exceeded the server side queue or received a NULL name
+        * from the underlying CN implementation, don't queue up any more
+        * requests until we can send a catch-all response to the client */
        if (fsp->notify->num_changes == -1) {
                return;
        }
 
-       if (!(changes = TALLOC_REALLOC_ARRAY(
+       if (!(changes = talloc_realloc(
                      fsp->notify, fsp->notify->changes,
-                     struct notify_change, fsp->notify->num_changes+1))) {
+                     struct notify_change_event,
+                     fsp->notify->num_changes+1))) {
                DEBUG(0, ("talloc_realloc failed\n"));
                return;
        }
@@ -419,6 +570,7 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
        string_replace(tmp, '/', '\\');
        change->name = tmp;     
 
+       change->when = when;
        change->action = action;
        fsp->notify->num_changes += 1;
 
@@ -443,15 +595,16 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
         * TODO: do we have to walk the lists of requests pending?
         */
 
-       change_notify_reply(fsp->conn,
-                       fsp->notify->requests->request_buf,
+       change_notify_reply(fsp->notify->requests->req,
+                           NT_STATUS_OK,
                            fsp->notify->requests->max_param,
-                           fsp->notify);
+                           fsp->notify,
+                           fsp->notify->requests->reply_fn);
 
-       change_notify_remove_request(fsp->notify->requests);
+       change_notify_remove_request(fsp->conn->sconn, fsp->notify->requests);
 }
 
-char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)
+char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32_t filter)
 {
        char *result = NULL;
 
@@ -489,31 +642,17 @@ char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)
        return result;
 }
 
-struct sys_notify_context *sys_notify_context_create(connection_struct *conn,
-                                                    TALLOC_CTX *mem_ctx, 
-                                                    struct event_context *ev)
+struct sys_notify_context *sys_notify_context_create(TALLOC_CTX *mem_ctx,
+                                                    struct tevent_context *ev)
 {
        struct sys_notify_context *ctx;
 
-       if (!(ctx = TALLOC_P(mem_ctx, struct sys_notify_context))) {
+       if (!(ctx = talloc(mem_ctx, struct sys_notify_context))) {
                DEBUG(0, ("talloc failed\n"));
                return NULL;
        }
 
        ctx->ev = ev;
-       ctx->conn = conn;
        ctx->private_data = NULL;
        return ctx;
 }
-
-NTSTATUS sys_notify_watch(struct sys_notify_context *ctx,
-                         struct notify_entry *e,
-                         void (*callback)(struct sys_notify_context *ctx, 
-                                          void *private_data,
-                                          struct notify_event *ev),
-                         void *private_data, void *handle)
-{
-       return SMB_VFS_NOTIFY_WATCH(ctx->conn, ctx, e, callback, private_data,
-                                   handle);
-}
-