diff options
| author | Volker Lendecke <vl@samba.org> | 2014-06-29 11:38:35 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-06-30 22:28:15 +0200 |
| commit | 8ae692cc91ad2dff0bdb9a6d3ccfcf1bcb58a654 (patch) | |
| tree | 10d8f9a4c89abcd18b89e739433c969bf505eb3e /source3/locking | |
| parent | c5fb0f9cc023fcac1260239b0c543759b38f09e6 (diff) | |
| download | samba-8ae692cc91ad2dff0bdb9a6d3ccfcf1bcb58a654.tar.gz samba-8ae692cc91ad2dff0bdb9a6d3ccfcf1bcb58a654.tar.xz samba-8ae692cc91ad2dff0bdb9a6d3ccfcf1bcb58a654.zip | |
smbd: validate_lock_entries does not need mem_ctx anymore
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 198d860549..e134aacd9b 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1710,8 +1710,7 @@ bool brl_reconnect_disconnected(struct files_struct *fsp) /**************************************************************************** Ensure this set of lock entries is valid. ****************************************************************************/ -static bool validate_lock_entries(TALLOC_CTX *mem_ctx, - unsigned int *pnum_entries, struct lock_struct **pplocks, +static bool validate_lock_entries(unsigned int *pnum_entries, struct lock_struct **pplocks, bool keep_disconnected) { unsigned int i; @@ -1824,7 +1823,7 @@ static int brl_traverse_fn(struct db_record *rec, void *state) /* Ensure the lock db is clean of entries from invalid processes. */ - if (!validate_lock_entries(talloc_tos(), &num_locks, &locks, true)) { + if (!validate_lock_entries(&num_locks, &locks, true)) { TALLOC_FREE(locks); return -1; /* Terminate traversal */ } @@ -2025,7 +2024,7 @@ struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx, files_struct *fsp) * So we need to clean the disconnected brl entry. */ - if (!validate_lock_entries(br_lck, &br_lck->num_locks, + if (!validate_lock_entries(&br_lck->num_locks, &br_lck->lock_data, false)) { TALLOC_FREE(br_lck); return NULL; |