diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-06 08:22:13 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-05-06 08:22:13 -0700 |
| commit | a77a8a5e351bf9aeaeda571d753775c8d2977184 (patch) | |
| tree | eeb2a803c962678c29b359e8d0c78fca3120dd27 /source3/smbd/blocking.c | |
| parent | e0f602f2c9252e4df81814fc8aa22641620f381b (diff) | |
| download | samba-a77a8a5e351bf9aeaeda571d753775c8d2977184.tar.gz samba-a77a8a5e351bf9aeaeda571d753775c8d2977184.tar.bz2 samba-a77a8a5e351bf9aeaeda571d753775c8d2977184.zip | |
Fix more SMB2 locking. We still crash but this won't last :-).
Jeremy.
Diffstat (limited to 'source3/smbd/blocking.c')
| -rw-r--r-- | source3/smbd/blocking.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index b50c4f48f2..e78d80777e 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -706,15 +706,14 @@ static void received_unlock_msg(struct messaging_context *msg, void process_blocking_lock_queue(void) { struct smbd_server_connection *sconn = smbd_server_conn; - struct timeval tv_curr; + struct timeval tv_curr = timeval_current(); struct blocking_lock_record *blr, *next = NULL; if (sconn->allow_smb2) { - process_blocking_lock_queue_smb2(); + process_blocking_lock_queue_smb2(tv_curr); return; } - tv_curr = timeval_current(); /* * Go through the queue and see if we can get any of the locks. */ |