From 6a2bf12f6a95fcff747f28ea5089c6e93b26643c Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Wed, 21 Mar 2012 11:52:27 +0100
Subject: s3: Remove "conn" from sys_notify_context

---
 source3/include/smb.h         | 1 -
 source3/modules/vfs_default.c | 2 +-
 source3/smbd/notify.c         | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 382926c07e0..86f69b4a066 100644
--- 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 37ec7e884d2..7b80df89043 100644
--- 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 e9349f65313..14e946667b4 100644
--- 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;
 }
-- 
cgit