The branch, master has been updated via a503437 s3/smbd: update exclusive oplock optimisation to the lease area via 0a4a08a s3/smbd: update exclusive oplock optimisation to the lease area via f631e95 s3/locking: helper functions for lease types via 952701d s3/locking: add const to fsp_lease_type from 9703464 pidl: Fix Coverity warnings from duplicate NULL checks.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a50343779a8a92d6f53095b36506b1d47ef68513 Author: Ralph Boehme <s...@samba.org> Date: Thu May 4 11:52:16 2017 +0200 s3/smbd: update exclusive oplock optimisation to the lease area Update an optimisation in update_num_read_oplocks() that checks for exclusive oplocks to the lease area. The idea of the optimisation is to avoid expensive db queries in brlock.tdb if we *know* we're the only open. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766 Signed-off-by: Ralph Boehme <s...@samba.org> Signed-off-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Sat May 6 22:58:47 CEST 2017 on sn-devel-144 commit 0a4a08ad1cef3b7d6fd47df3a93c2c89dd287ee8 Author: Ralph Boehme <s...@samba.org> Date: Thu Apr 20 21:37:37 2017 +0200 s3/smbd: update exclusive oplock optimisation to the lease area This is similar to 9533a55ee5ffe430589dcea845851b84876ef656 but this time in the contend_level2_oplocks_begin_default() function. The idea of the optimisation is to avoid expensive db queries in locking.tdb if we *know* we're the only open. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766 Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit f631e95e2de857ea98204609a71e6db00993994b Author: Ralph Boehme <s...@samba.org> Date: Thu May 4 11:50:56 2017 +0200 s3/locking: helper functions for lease types Add some helper functions that will be used to update a bunch of checks for exclusive oplocks to the lease area. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766 Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 952701dce09b1ee89a0f6a450ac244fd6451955b Author: Ralph Boehme <s...@samba.org> Date: Thu May 4 11:50:01 2017 +0200 s3/locking: add const to fsp_lease_type Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766 Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/locking/leases_util.c | 19 ++++++++++++++++++- source3/locking/proto.h | 4 +++- source3/smbd/oplock.c | 15 ++++++++++----- 3 files changed, 31 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locking/leases_util.c b/source3/locking/leases_util.c index cb307c8..af1e837 100644 --- a/source3/locking/leases_util.c +++ b/source3/locking/leases_util.c @@ -46,10 +46,27 @@ uint32_t map_oplock_to_lease_type(uint16_t op_type) return ret; } -uint32_t fsp_lease_type(struct files_struct *fsp) +uint32_t fsp_lease_type(const struct files_struct *fsp) { if (fsp->oplock_type == LEASE_OPLOCK) { return fsp->lease->lease.lease_state; } return map_oplock_to_lease_type(fsp->oplock_type); } + +uint32_t lease_type_is_exclusive(uint32_t lease_type) +{ + if ((lease_type & (SMB2_LEASE_READ | SMB2_LEASE_WRITE)) == + (SMB2_LEASE_READ | SMB2_LEASE_WRITE)) { + return true; + } + + return false; +} + +bool fsp_lease_type_is_exclusive(const struct files_struct *fsp) +{ + uint32_t lease_type = fsp_lease_type(fsp); + + return lease_type_is_exclusive(lease_type); +} diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 967af02..5d2326a 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -257,6 +257,8 @@ bool release_posix_lock_posix_flavour(files_struct *fsp, /* The following definitions come from locking/leases_util.c */ uint32_t map_oplock_to_lease_type(uint16_t op_type); -uint32_t fsp_lease_type(struct files_struct *fsp); +uint32_t fsp_lease_type(const struct files_struct *fsp); +uint32_t lease_type_is_exclusive(uint32_t lease_type); +bool fsp_lease_type_is_exclusive(const struct files_struct *fsp); #endif /* _LOCKING_PROTO_H_ */ diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 417eda5..aa060ad 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -166,13 +166,18 @@ bool update_num_read_oplocks(files_struct *fsp, struct share_mode_lock *lck) uint32_t num_read_oplocks = 0; uint32_t i; - if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) { + if (fsp_lease_type_is_exclusive(fsp)) { /* - * If we're the only one, we don't need a brlock entry + * If we're fully exclusive, we don't need a brlock entry */ remove_stale_share_mode_entries(d); - SMB_ASSERT(d->num_share_modes == 1); - SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type)); + + for (i=0; i<d->num_share_modes; i++) { + struct share_mode_entry *e = &d->share_modes[i]; + uint32_t e_lease_type = get_lease_type(d, e); + + SMB_ASSERT(lease_type_is_exclusive(e_lease_type)); + } return true; } @@ -1044,7 +1049,7 @@ static void contend_level2_oplocks_begin_default(files_struct *fsp, * the shared memory area whilst doing this. */ - if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) { + if (fsp_lease_type_is_exclusive(fsp)) { /* * There can't be any level2 oplocks, we're alone. */ -- Samba Shared Repository