From 3b2e5929eca008dd6ad2f6ab5436eeb55ab69607 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 8 Jun 2012 12:05:56 +0200 Subject: s3:smb2_lock: use smb2req->compat_chain_fsp instead of looking it up again metze --- source3/smbd/smb2_lock.c | 7 +------ 1 file changed, 1 insertion(+), 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; -- cgit