sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

s3:smbd/oplock obey kernel oplock setting when releasing oplocks

Browse Source 
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 <ambi@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Jan  6 08:58:56 CET 2016 on sn-devel-144

(cherry picked from commit eda6aaf1533b69d093ba67ff5e22fcda0073dd3f)
This commit is contained in:
Christian Ambach 2016-01-04 23:12:25 +01:00 committed by Karolin Seeger
parent 43ade9aa1b
commit db70921297
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/smbd/oplock.c
View File

@ -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);
}