diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-06-08 12:05:56 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-09 15:02:47 +0200 |
| commit | 3b2e5929eca008dd6ad2f6ab5436eeb55ab69607 (patch) | |
| tree | 15b52b346f2e6420424350c00dd0e35c40cb2afc /source3/smbd/smb2_lock.c | |
| parent | 163207a28eb81f844070c5e87b6c0061d2fcc702 (diff) | |
| download | samba-3b2e5929eca008dd6ad2f6ab5436eeb55ab69607.tar.gz samba-3b2e5929eca008dd6ad2f6ab5436eeb55ab69607.tar.bz2 samba-3b2e5929eca008dd6ad2f6ab5436eeb55ab69607.zip | |
s3:smb2_lock: use smb2req->compat_chain_fsp instead of looking it up again
metze
Diffstat (limited to 'source3/smbd/smb2_lock.c')
| -rw-r--r-- | source3/smbd/smb2_lock.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index fdca266a27..e4e0cac8b1 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -861,10 +861,8 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, struct smbd_smb2_lock_state *state = NULL; files_struct *fsp_curr = NULL; int i = smb2req->current_idx; - uint64_t in_file_id_volatile; struct blocking_lock_record *blr = NULL; const uint8_t *inhdr; - const uint8_t *inbody; nextreq = smb2req->next; @@ -883,9 +881,6 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, continue; } - inbody = (const uint8_t *)smb2req->in.vector[i+1].iov_base; - in_file_id_volatile = BVAL(inbody, 0x10); - state = tevent_req_data(smb2req->subreq, struct smbd_smb2_lock_state); if (!state) { @@ -893,7 +888,7 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, continue; } - fsp_curr = file_fsp(state->smb1req, (uint16_t)in_file_id_volatile); + fsp_curr = smb2req->compat_chain_fsp; if (fsp_curr == NULL) { /* Strange - is this even possible ? */ continue; |