diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-12 14:23:12 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-12 15:42:56 +0200 |
| commit | f856fb0b359a21a786a62ea9f70043afcd6f8373 (patch) | |
| tree | 98785e9132eb0e2a475a2e044476a0c5530196b0 | |
| parent | 91bd52da1a96f7be60df93dfb1a629424b517f0c (diff) | |
| download | samba-f856fb0b359a21a786a62ea9f70043afcd6f8373.tar.gz samba-f856fb0b359a21a786a62ea9f70043afcd6f8373.tar.bz2 samba-f856fb0b359a21a786a62ea9f70043afcd6f8373.zip | |
s3: Explicitly pass sconn to remove_pending_lock_requests_by_mid_smb1
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/smbd/blocking.c | 4 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d263eab0b1..8bcef3c49c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5370,7 +5370,8 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck, void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck, enum file_close_type close_type); -void remove_pending_lock_requests_by_mid_smb1(uint64_t mid); +void remove_pending_lock_requests_by_mid_smb1( + struct smbd_server_connection *sconn, uint64_t mid); bool blocking_lock_was_deferred_smb1(uint64_t mid); struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp, uint64_t smblctx, diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index b7228467e2..f87841e66d 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -632,9 +632,9 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp, Only called from the SMB1 cancel code. *****************************************************************************/ -void remove_pending_lock_requests_by_mid_smb1(uint64_t mid) +void remove_pending_lock_requests_by_mid_smb1( + struct smbd_server_connection *sconn, uint64_t mid) { - struct smbd_server_connection *sconn = smbd_server_conn; struct blocking_lock_record *blr, *next = NULL; for(blr = sconn->smb1.locks.blocking_lock_queue; blr; blr = next) { diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index fdee584282..c5b5fee6d1 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1279,7 +1279,7 @@ void reply_ntcancel(struct smb_request *req) START_PROFILE(SMBntcancel); srv_cancel_sign_response(req->sconn); remove_pending_change_notify_requests_by_mid(req->sconn, req->mid); - remove_pending_lock_requests_by_mid_smb1(req->mid); + remove_pending_lock_requests_by_mid_smb1(req->sconn, req->mid); DEBUG(3,("reply_ntcancel: cancel called on mid = %llu.\n", (unsigned long long)req->mid)); |