From 9747eb45d606222b8a8361a9e0a3d878b063551a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 12 Jun 2010 14:44:53 +0200 Subject: s3: Explicitly pass sconn to open_was_deferred_smb2 --- source3/smbd/globals.h | 3 ++- source3/smbd/process.c | 2 +- source3/smbd/smb2_create.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 31d001b185..1a87238d1d 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -326,7 +326,8 @@ int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level); bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req, struct timeval *p_request_time, void **pp_state); -bool open_was_deferred_smb2(uint64_t mid); +bool open_was_deferred_smb2(struct smbd_server_connection *sconn, + uint64_t mid); void remove_deferred_open_message_smb2(uint64_t mid); void schedule_deferred_open_message_smb2(uint64_t mid); bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req, diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 6a6b669011..528c805c48 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -699,7 +699,7 @@ bool open_was_deferred(uint64_t mid) struct pending_message_list *pml; if (smbd_server_conn->using_smb2) { - return open_was_deferred_smb2(mid); + return open_was_deferred_smb2(smbd_server_conn, mid); } for (pml = deferred_open_queue; pml; pml = pml->next) { diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index e585d490ea..98c5838000 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -934,12 +934,12 @@ static struct smbd_smb2_request *find_open_smb2req( return NULL; } -bool open_was_deferred_smb2(uint64_t mid) +bool open_was_deferred_smb2(struct smbd_server_connection *sconn, uint64_t mid) { struct smbd_smb2_create_state *state = NULL; struct smbd_smb2_request *smb2req; - smb2req = find_open_smb2req(smbd_server_conn, mid); + smb2req = find_open_smb2req(sconn, mid); if (!smb2req) { DEBUG(10,("open_was_deferred_smb2: mid %llu smb2req == NULL\n", -- cgit