summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 13:13:20 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:55 +0200
commit4a9b3e557f0a3b4049b301574461a39ef0e4ba09 (patch)
tree96b08baa9b9a34dbce384b365ca631e3abd33ebc
parent9386e2d9d8c908a5424e244b0c049fbcfab07aa9 (diff)
downloadsamba-4a9b3e557f0a3b4049b301574461a39ef0e4ba09.tar.gz
s3: Explicitly pass sconn to the change_notify_remove_request
-rw-r--r--source3/smbd/notify.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index e3c9fc72e6e..5c5a52a95b4 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -265,11 +265,11 @@ NTSTATUS change_notify_add_request(struct smb_request *req,
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;
- struct smbd_server_connection *sconn = smbd_server_conn;
/*
* Paranoia checks, the fsp referenced must must have the request in
@@ -315,7 +315,7 @@ void remove_pending_change_notify_requests_by_mid(uint64_t mid)
change_notify_reply(map->req->fsp->conn, map->req->req,
NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
- change_notify_remove_request(map->req);
+ change_notify_remove_request(sconn, map->req);
}
void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq)
@@ -335,7 +335,7 @@ void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq)
change_notify_reply(map->req->fsp->conn, map->req->req,
NT_STATUS_CANCELLED, 0, NULL, map->req->reply_fn);
- change_notify_remove_request(map->req);
+ change_notify_remove_request(sconn, map->req);
}
/****************************************************************************
@@ -353,7 +353,8 @@ void remove_pending_change_notify_requests_by_fid(files_struct *fsp,
change_notify_reply(fsp->conn, fsp->notify->requests->req,
status, 0, NULL,
fsp->notify->requests->reply_fn);
- change_notify_remove_request(fsp->notify->requests);
+ change_notify_remove_request(fsp->conn->sconn,
+ fsp->notify->requests);
}
}
@@ -424,7 +425,8 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
fsp->notify->requests->max_param,
fsp->notify,
fsp->notify->requests->reply_fn);
- change_notify_remove_request(fsp->notify->requests);
+ change_notify_remove_request(fsp->conn->sconn,
+ fsp->notify->requests);
}
return;
}
@@ -486,7 +488,7 @@ static void notify_fsp(files_struct *fsp, uint32 action, const char *name)
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)