From 28df2b0d0dc969d6fa7a462cce704b75c95136f9 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 3 Jul 2014 10:18:36 +0000 Subject: [PATCH] smbd: Use brl_delete_lock_struct in brl_lock_cancel_default Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/locking/brlock.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 2ab70929f3f..58a6996c662 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1509,12 +1509,7 @@ bool brl_lock_cancel_default(struct byte_range_lock *br_lck, return False; } - if (i < br_lck->num_locks - 1) { - /* Found this particular pending lock - delete it */ - memmove(&locks[i], &locks[i+1], - sizeof(*locks)*((br_lck->num_locks-1) - i)); - } - + brl_delete_lock_struct(locks, br_lck->num_locks, i); br_lck->num_locks -= 1; br_lck->modified = True; return True; -- 2.11.4.GIT