Attachment 7872 Details for Bug 9150 – git-am fix for 3.6.x

[patch] git-am fix for 3.6.x

0001-s3-delete-requests-are-not-special.patch (text/plain), 1.40 KB, created by Jeremy Allison on 2012-09-10 21:11:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-09-10 21:11:11 UTC

Size: 1.40 KB

patch

obsolete

>From ba64f58da6dd0fb053122ef46517a4d9a8dae910 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 10 Sep 2012 11:25:03 +0200
>Subject: [PATCH] s3: delete requests are not special
>
>The only difference between batch and exclusive oplocks is the time of
>the check: Batch is checked before the share mode check, exclusive after.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/open.c |   14 ++------------
> 1 files changed, 2 insertions(+), 12 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index 3100ad0..7d6a25f 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -934,11 +934,6 @@ static NTSTATUS open_mode_check(connection_struct *conn,
> 	return NT_STATUS_OK;
> }
> 
>-static bool is_delete_request(files_struct *fsp) {
>-	return ((fsp->access_mask == DELETE_ACCESS) &&
>-		(fsp->oplock_type == NO_OPLOCK));
>-}
>-
> /*
>  * Send a break message to the oplock holder and delay the open for
>  * our client.
>@@ -1083,13 +1078,8 @@ static bool delay_for_exclusive_oplocks(files_struct *fsp,
> 	}
> 
> 	if (ex_entry != NULL) {
>-		/* Found an exclusive or batch oplock */
>-		bool delay_it = is_delete_request(fsp) ?
>-				BATCH_OPLOCK_TYPE(ex_entry->op_type) : true;
>-		if (delay_it) {
>-			send_break_message(fsp, ex_entry, mid, oplock_request);
>-			return true;
>-		}
>+		send_break_message(fsp, ex_entry, mid, oplock_request);
>+		return true;
> 	}
> 	return false;
> }
>-- 
>1.7.7.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 9150: 7872 | 7873