sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: Explicitly pass sconn to process_blocking_lock_queue

Browse Source
This commit is contained in:
Volker Lendecke 2010-06-12 14:31:04 +02:00
parent cb03710c76
commit 330a64c72b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -5355,7 +5355,7 @@ void brl_timeout_fn(struct event_context *event_ctx,
void *private_data);
struct timeval timeval_brl_min(const struct timeval *tv1,
const struct timeval *tv2);
void process_blocking_lock_queue(void);
void process_blocking_lock_queue(struct smbd_server_connection *sconn);
bool push_blocking_lock_request( struct byte_range_lock *br_lck,
struct smb_request *req,
files_struct *fsp,

4
source3/modules/onefs_cbrl.c
View File

@ -184,7 +184,7 @@ static void onefs_cbrl_async_success(uint64_t id)
LEVEL2_CONTEND_WINDOWS_BRL);
/* Process the queue, to try the next lock or finish up. */
process_blocking_lock_queue();
process_blocking_lock_queue(smbd_server_conn);
}
static void onefs_cbrl_async_failure(uint64_t id)
@ -207,7 +207,7 @@ static void onefs_cbrl_async_failure(uint64_t id)
/* Process the queue. It will end up trying to retake the same lock,
* see the error in onefs_cbrl_lock_windows() and fail. */
process_blocking_lock_queue();
process_blocking_lock_queue(smbd_server_conn);
}
static struct cbrl_event_ops cbrl_ops =

7
source3/smbd/blocking.c
View File

@ -53,7 +53,7 @@ void brl_timeout_fn(struct event_context *event_ctx,
change_to_root_user(); /* TODO: Possibly run all timed events as
* root */
process_blocking_lock_queue();
process_blocking_lock_queue(sconn);
}
/****************************************************************************
@ -701,16 +701,15 @@ static void received_unlock_msg(struct messaging_context *msg,
DATA_BLOB *data)
{
DEBUG(10,("received_unlock_msg\n"));
process_blocking_lock_queue();
process_blocking_lock_queue(smbd_server_conn);
}
/****************************************************************************
Process the blocking lock queue. Note that this is only called as root.
*****************************************************************************/
void process_blocking_lock_queue(void)
void process_blocking_lock_queue(struct smbd_server_connection *sconn)
{
struct smbd_server_connection *sconn = smbd_server_conn;
struct timeval tv_curr = timeval_current();
struct blocking_lock_record *blr, *next = NULL;