s3: Remove "conn" from sys_notify_context

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 382926c07e011f0acb11f5d083cbc4d301d45b65..86f69b4a066aabc5b60774c966640dd3097259fe 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -192,7 +192,6 @@ struct notify_change_request;
 struct sys_notify_backend;
 struct sys_notify_context {
        struct event_context *ev;
-       struct connection_struct *conn;
        void *private_data;     /* For use by the system backend */
 };
 

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 37ec7e884d24fc4a40fcfe4be45fd54fd9d77257..7b80df890435e726b8bb01493758fcc860187396 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1648,7 +1648,7 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle,
         * Until that is the case, hard-code inotify here.
         */
 #ifdef HAVE_INOTIFY
-       if (lp_kernel_change_notify(ctx->conn->params)) {
+       if (lp_kernel_change_notify(vfs_handle->conn->params)) {
                return inotify_watch(ctx, e, path, callback, private_data,
                                     handle);
        }

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index e9349f65313b0e9b64754b3e619b55c166c96af9..14e946667b4c45f3e4a236d04ec7e9d6f4f9826a 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -542,7 +542,6 @@ struct sys_notify_context *sys_notify_context_create(connection_struct *conn,
        }
 
        ctx->ev = ev;
-       ctx->conn = conn;
        ctx->private_data = NULL;
        return ctx;
 }