summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-03-21 11:52:27 +0100
committerVolker Lendecke <vl@samba.org>2012-03-21 12:52:09 +0100
commit6a2bf12f6a95fcff747f28ea5089c6e93b26643c (patch)
treec3d4ebbc74eb7b0a408798da27fd9f5c2ac7a63a
parent8e256a2734bed8785c5fe919a442627050e70af9 (diff)
downloadsamba-6a2bf12f6a95fcff747f28ea5089c6e93b26643c.tar.gz
samba-6a2bf12f6a95fcff747f28ea5089c6e93b26643c.tar.bz2
samba-6a2bf12f6a95fcff747f28ea5089c6e93b26643c.zip
s3: Remove "conn" from sys_notify_context
-rw-r--r--source3/include/smb.h1
-rw-r--r--source3/modules/vfs_default.c2
-rw-r--r--source3/smbd/notify.c1
3 files changed, 1 insertions, 3 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 382926c07e..86f69b4a06 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 37ec7e884d..7b80df8904 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 e9349f6531..14e946667b 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;
}