The branch, master has been updated
via eda6aaf s3:smbd/oplock obey kernel oplock setting when releasing
oplocks
from 3e1b26b selftest: more dfree command and smbclient disk usage tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit eda6aaf1533b69d093ba67ff5e22fcda0073dd3f
Author: Christian Ambach <a...@samba.org>
Date: Mon Jan 4 23:12:25 2016 +0100
s3:smbd/oplock obey kernel oplock setting when releasing oplocks
otherwise smbd asks the kernel to release an oplock that was never requested
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11400
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Wed Jan 6 08:58:56 CET 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/oplock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 4d84347..4f108d9 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -96,9 +96,10 @@ static void release_file_oplock(files_struct *fsp)
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
+ bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) && koplocks;
if ((fsp->oplock_type != NO_OPLOCK) &&
- koplocks) {
+ use_kernel) {
koplocks->ops->release_oplock(koplocks, fsp, NO_OPLOCK);
}
--
Samba Shared Repository
