sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:smb2_lock: use smb2req->compat_chain_fsp instead of looking it up again

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2012-06-08 12:05:56 +02:00
parent 163207a28e
commit 3b2e5929ec
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/smbd/smb2_lock.c
View File

@ -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;