Attachment 11759 Details for Bug 11400 – Patch for 4.3.x and 4.2.x with cherry-pick information

[patch] Patch for 4.3.x and 4.2.x with cherry-pick information

11400.patch (text/plain), 1.27 KB, created by Christian Ambach on 2016-01-06 19:41:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2016-01-06 19:41:01 UTC

Size: 1.27 KB

patch

obsolete

>From 892b4b06f07178e742efb34218d7fd2d2697ccf1 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>
>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)
>---
> 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
>

Flags:

jra: review+

Actions: View

Attachments on bug 11400: 11756 | 11759