Attachment 11756 Details for Bug 11400 – possible patch

[patch] possible patch

11400.patch (text/plain), 1.04 KB, created by Christian Ambach on 2016-01-04 22:14:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2016-01-04 22:14:26 UTC

Size: 1.04 KB

patch

obsolete

>From e98e6d3be6879b7572e53524157d06eb83d21dbc Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Mon, 4 Jan 2016 23:12:25 +0100
>Subject: [PATCH] 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 <ambi@samba.org>
>---
> source3/smbd/oplock.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>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);
> 	}
> 
>-- 
>1.9.1
>

Actions: View

Attachments on bug 11400: 11756 | 11759