summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-10-03 17:24:33 +0200
committerVolker Lendecke <vl@samba.org>2010-10-03 18:17:08 +0200
commit554f5e7c6035577ab6463f12cc0e5b4a089cbc86 (patch)
tree9f26e071e02aa33c76bc7a74ce70a62da0dd9a80
parent5d1d575e87dfd8a378f385ce1d99c66956cbb17b (diff)
downloadsamba-554f5e7c6035577ab6463f12cc0e5b4a089cbc86.tar.gz
samba-554f5e7c6035577ab6463f12cc0e5b4a089cbc86.tar.bz2
samba-554f5e7c6035577ab6463f12cc0e5b4a089cbc86.zip
s3: Remove smbd_server_conn from process_kernel_oplock_break
-rw-r--r--source3/smbd/oplock.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 8a43ea00bc..c632e8a0f2 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -585,7 +585,7 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
struct server_id src,
DATA_BLOB *data)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
+ struct smbd_server_connection *sconn;
struct file_id id;
unsigned long file_id;
files_struct *fsp;
@@ -600,6 +600,12 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
return;
}
+ sconn = msg_ctx_to_sconn(msg_ctx);
+ if (sconn == NULL) {
+ DEBUG(1, ("could not find sconn\n"));
+ return;
+ }
+
/* Pull the data from the message. */
pull_file_id_24((char *)data->data, &id);
file_id = (unsigned long)IVAL(data->data, 24);
@@ -608,7 +614,7 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
procid_str(talloc_tos(), &src), file_id_string_tos(&id),
(unsigned int)file_id));
- fsp = initial_break_processing(smbd_server_conn, id, file_id);
+ fsp = initial_break_processing(sconn, id, file_id);
if (fsp == NULL) {
DEBUG(3, ("Got a kernel oplock break message for a file "