[PATCH] Found in my attic

[Jeremy Allison]

On Wed, Jul 25, 2018 at 12:40:55AM +0200, David Disseldorp wrote:
> On Tue, 24 Jul 2018 11:40:36 -0700, Jeremy Allison wrote:
> 
> > > > FYI, we should also remove the Irix kernel oplock
> > > > code support at some point.  
> > > 
> > > Yes please, there's quite a bit of other Irix cruft around waiting to be
> > > shown the door :)  
> > 
> > Here's a start. Please review and push if happy !
> 
> Reviewed-by: David Disseldorp <ddiss at samba.org>
> Looks good, but is missing the corresponding docs change. Feel free to
> squash the attached change in with your patch or push separately.

Oh thanks for catching that !

> From 2412691b2a953b1ed3b1c30c88a49d57182bd38e Mon Sep 17 00:00:00 2001
> From: David Disseldorp <ddiss at samba.org>
> Date: Wed, 25 Jul 2018 00:33:09 +0200
> Subject: [PATCH] docs/kerneloplocks: drop Irix references
> 
> Signed-off-by: David Disseldorp <ddiss at samba.org>
> ---
>  docs-xml/smbdotconf/locking/kerneloplocks.xml | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/docs-xml/smbdotconf/locking/kerneloplocks.xml b/docs-xml/smbdotconf/locking/kerneloplocks.xml
> index a22cdf2446d..ff237ec76e3 100644
> --- a/docs-xml/smbdotconf/locking/kerneloplocks.xml
> +++ b/docs-xml/smbdotconf/locking/kerneloplocks.xml
> @@ -4,19 +4,18 @@
>                   xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
>  <description>
>  	<para>For UNIXes that support kernel based <smbconfoption name="oplocks"/>
> -	(currently only IRIX and the Linux 2.4 kernel), this parameter 
> -	allows the use of them to be turned on or off. However, this disables
> -	Level II oplocks for clients as the Linux and IRIX kernels do not
> -	support them properly.</para>
> +	(currently only Linux), this parameter allows the use of them to be
> +	turned on or off. However, this disables Level II oplocks for clients as
> +	the Linux kernel does not support them properly.</para>
>  
>  	<para>Kernel oplocks support allows Samba <parameter moreinfo="none">oplocks
> -	</parameter> to be broken whenever a local UNIX process or NFS operation 
> +	</parameter> to be broken whenever a local UNIX process or NFS operation
>  	accesses a file that <citerefentry><refentrytitle>smbd</refentrytitle>
> -	<manvolnum>8</manvolnum></citerefentry> has oplocked. This allows complete 
> -	data consistency between SMB/CIFS, NFS and local file access (and is 
> +	<manvolnum>8</manvolnum></citerefentry> has oplocked. This allows complete
> +	data consistency between SMB/CIFS, NFS and local file access (and is
>  	a <emphasis>very</emphasis> cool feature :-).</para>
>  	<para>If you do not need this interaction, you should disable the
> -	parameter on Linux and IRIX to get Level II oplocks and the associated
> +	parameter on Linux to get Level II oplocks and the associated
>  	performance benefit.</para>
>  
>  	<para>This parameter defaults to <constant>no</constant> and is translated
> -- 
> 2.13.7
>