[PATCH] smbd: Fix an assert

Jeremy Allison jra at samba.org
Mon May 16 17:28:50 UTC 2016


On Mon, May 16, 2016 at 04:27:57PM +0200, Volker Lendecke wrote:
> Hi!
> 
> Review appreciated. This is a confirmed fix for bug 11844.

LGTM. Pushed.

> -- 
> SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
> phone: +49-551-370000-0, fax: +49-551-370000-9
> AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
> http://www.sernet.de, mailto:kontakt at sernet.de

> From 79373159665a89b6241b2a9297caafc301960ae8 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Wed, 20 Apr 2016 13:13:38 +0200
> Subject: [PATCH] smbd: Fix an assert
> 
> This might stumble over stale entries
> 
> Bug: https://bugzilla.samba.org/show_bug.cgi?id=11844
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
>  source3/smbd/oplock.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
> index 4f108d9..4ce3a1d 100644
> --- a/source3/smbd/oplock.c
> +++ b/source3/smbd/oplock.c
> @@ -190,6 +190,7 @@ bool update_num_read_oplocks(files_struct *fsp, struct share_mode_lock *lck)
>  		/*
>  		 * If we're the only one, we don't need a brlock entry
>  		 */
> +		remove_stale_share_mode_entries(d);
>  		SMB_ASSERT(d->num_share_modes == 1);
>  		SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type));
>  		return true;
> -- 
> 1.9.1
> 




More information about the samba-technical mailing list