diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-03 10:18:36 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-07-04 06:31:16 +0200 |
| commit | 28df2b0d0dc969d6fa7a462cce704b75c95136f9 (patch) | |
| tree | 9d52f8792d9504c50d42ee59966ec1199758e3ff | |
| parent | f93ae07679877834a27fbcb936b49efd59c6b0c2 (diff) | |
| download | samba-28df2b0d0dc969d6fa7a462cce704b75c95136f9.tar.gz samba-28df2b0d0dc969d6fa7a462cce704b75c95136f9.tar.xz samba-28df2b0d0dc969d6fa7a462cce704b75c95136f9.zip | |
smbd: Use brl_delete_lock_struct in brl_lock_cancel_default
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/locking/brlock.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 2ab70929f3..58a6996c66 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; |