diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-16 09:40:47 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-21 11:40:13 +0100 |
| commit | f0a933d1408678fabc856e89a5aaebb792047de3 (patch) | |
| tree | a6740c2d9bcd89d3dbec413d681eaef9561dd014 /source3/locking/locking.c | |
| parent | bda1c701f418d3263d36714f9b646ab60ea2da0f (diff) | |
| download | samba-f0a933d1408678fabc856e89a5aaebb792047de3.tar.gz samba-f0a933d1408678fabc856e89a5aaebb792047de3.tar.bz2 samba-f0a933d1408678fabc856e89a5aaebb792047de3.zip | |
s3: Cache brlock.tdb entries for the fast read&write strict locking code path
For a netbench run this gains around 2% user-space CPU, fetching a 100MB file
takes around 4% less.
Diffstat (limited to 'source3/locking/locking.c')
| -rw-r--r-- | source3/locking/locking.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index cf787d4fac..5a6fdf081e 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -116,7 +116,9 @@ bool strict_lock_default(files_struct *fsp, struct lock_struct *plock) DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp_str_dbg(fsp))); ret = True; } else { - struct byte_range_lock *br_lck = brl_get_locks_readonly(talloc_tos(), fsp); + struct byte_range_lock *br_lck; + + br_lck = brl_get_locks_readonly(fsp); if (!br_lck) { return True; } @@ -127,10 +129,11 @@ bool strict_lock_default(files_struct *fsp, struct lock_struct *plock) plock->size, plock->lock_type, plock->lock_flav); - TALLOC_FREE(br_lck); } } else { - struct byte_range_lock *br_lck = brl_get_locks_readonly(talloc_tos(), fsp); + struct byte_range_lock *br_lck; + + br_lck = brl_get_locks_readonly(fsp); if (!br_lck) { return True; } @@ -141,7 +144,6 @@ bool strict_lock_default(files_struct *fsp, struct lock_struct *plock) plock->size, plock->lock_type, plock->lock_flav); - TALLOC_FREE(br_lck); } DEBUG(10,("strict_lock_default: flavour = %s brl start=%.0f " @@ -170,7 +172,6 @@ NTSTATUS query_lock(files_struct *fsp, enum brl_flavour lock_flav) { struct byte_range_lock *br_lck = NULL; - NTSTATUS status = NT_STATUS_LOCK_NOT_GRANTED; if (!fsp->can_lock) { return fsp->is_directory ? NT_STATUS_INVALID_DEVICE_REQUEST : NT_STATUS_INVALID_HANDLE; @@ -180,21 +181,18 @@ NTSTATUS query_lock(files_struct *fsp, return NT_STATUS_OK; } - br_lck = brl_get_locks_readonly(talloc_tos(), fsp); + br_lck = brl_get_locks_readonly(fsp); if (!br_lck) { return NT_STATUS_NO_MEMORY; } - status = brl_lockquery(br_lck, + return brl_lockquery(br_lck, psmbpid, procid_self(), poffset, pcount, plock_type, lock_flav); - - TALLOC_FREE(br_lck); - return status; } static void increment_current_lock_count(files_struct *fsp, |