diff options
| author | Volker Lendecke <vl@samba.org> | 2010-10-03 17:18:26 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-10-03 18:17:08 +0200 |
| commit | 1d3aa74e4ce5b7d8fd6a916b2f36b46c6897fd27 (patch) | |
| tree | e1b8673b5bbb15eca512176d157867aaf0b16552 /source3 | |
| parent | fb2f0c5bdd5bd4cb62072cf2e2b9bc7d73ad6b42 (diff) | |
| download | samba-1d3aa74e4ce5b7d8fd6a916b2f36b46c6897fd27.tar.gz samba-1d3aa74e4ce5b7d8fd6a916b2f36b46c6897fd27.tar.bz2 samba-1d3aa74e4ce5b7d8fd6a916b2f36b46c6897fd27.zip | |
s3: Lift smbd_server_conn from initial_break_processing
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/oplock.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 5521a95c4c..2be9849607 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -256,7 +256,9 @@ static void wait_before_sending_break(void) Ensure that we have a valid oplock. ****************************************************************************/ -static files_struct *initial_break_processing(struct file_id id, unsigned long file_id) +static files_struct *initial_break_processing( + struct smbd_server_connection *sconn, struct file_id id, + unsigned long file_id) { files_struct *fsp = NULL; @@ -273,7 +275,7 @@ static files_struct *initial_break_processing(struct file_id id, unsigned long f * we have an oplock on it. */ - fsp = file_find_dif(smbd_server_conn, id, file_id); + fsp = file_find_dif(sconn, id, file_id); if(fsp == NULL) { /* The file could have been closed in the meantime - return success. */ @@ -447,7 +449,8 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx "%s/%lu\n", procid_str(talloc_tos(), &src), file_id_string_tos(&msg.id), msg.share_file_id)); - fsp = initial_break_processing(msg.id, msg.share_file_id); + fsp = initial_break_processing(smbd_server_conn, msg.id, + msg.share_file_id); if (fsp == NULL) { /* We hit a race here. Break messages are sent, and before we @@ -492,7 +495,8 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx, procid_str(talloc_tos(), &src), file_id_string_tos(&msg.id), msg.share_file_id)); - fsp = initial_break_processing(msg.id, msg.share_file_id); + fsp = initial_break_processing(smbd_server_conn, msg.id, + msg.share_file_id); if (fsp == NULL) { /* We hit a race here. Break messages are sent, and before we @@ -593,7 +597,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(id, file_id); + fsp = initial_break_processing(smbd_server_conn, id, file_id); if (fsp == NULL) { DEBUG(3, ("Got a kernel oplock break message for a file " |