sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

smbd: Use ARRAY_DEL_ELEMENT() in smbd_smb1_blocked_locks_cleanup()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2020-03-26 10:31:47 +01:00 committed by Ralph Boehme
parent 4ac624086b
commit a6de3d2046
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/smbd/blocking.c
View File

@ -312,7 +312,7 @@ static void smbd_smb1_blocked_locks_cleanup(
struct files_struct *fsp = state->fsp;
struct tevent_req **blocked = fsp->blocked_smb1_lock_reqs;
size_t num_blocked = talloc_array_length(blocked);
size_t i, num_after;
size_t i;
DBG_DEBUG("req=%p, state=%p, req_state=%d\n",
req,
@ -331,17 +331,8 @@ static void smbd_smb1_blocked_locks_cleanup(
}
SMB_ASSERT(i<num_blocked);
num_after = num_blocked - (i+1);
ARRAY_DEL_ELEMENT(blocked, i, num_blocked);
if (num_after > 0) {
/*
* The locks need to be kept in order, see
* raw.lock.multilock2
*/
memmove(&blocked[i],
&blocked[i+1],
sizeof(*blocked) * num_after);
}
fsp->blocked_smb1_lock_reqs = talloc_realloc(
fsp, blocked, struct tevent_req *, num_blocked-1);
}