[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  92c5e80 docs:man:vfs_gpfs: Remove itemized list to fix indentation
       via  d642afa s3: switch off kernel oplocks by default
      from  a8e9242 s3: Fix smbclient notify against Windows

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 92c5e80f46083885048c45d1203e656720b24cb3
Author: Christof Schmitt <christof.schmitt at us.ibm.com>
Date:   Wed Mar 28 12:57:11 2012 -0700

    docs:man:vfs_gpfs: Remove itemized list to fix indentation
    
    The indentation in the man page is wrong after the itemized list. An
    easy fix is to put the text in the paragraph instead.
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Mon Apr 16 23:00:37 CEST 2012 on sn-devel-104

commit d642afa7f16ba481ae89278ca00c01357c0b8c45
Author: Christian Ambach <ambi at samba.org>
Date:   Mon Apr 16 17:37:17 2012 +0200

    s3: switch off kernel oplocks by default
    
    as discussed on samba-technical, turn kernel oplocks off by default
    to not leave users without the benefits of Level II oplocks

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/vfs_gpfs.8.xml            |   15 ++++-----------
 docs-xml/smbdotconf/locking/kerneloplocks.xml |    7 +++----
 source3/param/loadparm.c                      |    2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml
index 4ea8c4d..3635143 100644
--- a/docs-xml/manpages-3/vfs_gpfs.8.xml
+++ b/docs-xml/manpages-3/vfs_gpfs.8.xml
@@ -227,19 +227,12 @@
 		Adjust reporting of the size and free space of a share
 		according to quotas. If this setting is "yes", a
 		request for size and free space will also evaluate the
-		following quotas:
+		user quota of the user requesting the data, the group
+		quota of the primary group of the user and the fileset
+		quota for the fileset containing the top level
+		directory of the share.
 		</para>
 
-		<itemizedlist>
-		<listitem><para>The user quota of the user requesting
-		    the data.</para></listitem>
-		<listitem><para>The group quota of the primary group
-		    of the user.</para></listitem>
-		<listitem><para>The fileset quota for the fileset
-		    containing the top level directory of the share.
-		</para></listitem>
-		</itemizedlist>
-
 		<para>
 		If any of the soft or hard quota limits has been
 		reached, the free space will be reported as 0. If a
diff --git a/docs-xml/smbdotconf/locking/kerneloplocks.xml b/docs-xml/smbdotconf/locking/kerneloplocks.xml
index 9ac7256..8e3bba5 100644
--- a/docs-xml/smbdotconf/locking/kerneloplocks.xml
+++ b/docs-xml/smbdotconf/locking/kerneloplocks.xml
@@ -19,12 +19,11 @@
 	parameter on Linux and IRIX to get Level II oplocks and the associated
 	performance benefit.</para>
 
-	<para>This parameter defaults to <constant>on</constant>, but is translated
-	to a no-op on systems that no not have the necessary kernel support.
-	You should never need to touch this parameter.</para>
+	<para>This parameter defaults to <constant>no</constant> and is translated
+	to a no-op on systems that do not have the necessary kernel support.</para>
 </description>
 
 <related>oplocks</related>
 <related>level2 oplocks</related>
-<value type="default">yes</value>
+<value type="default">no</value>
 </samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2fa70db..dbf47c0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -230,7 +230,7 @@ static struct loadparm_service sDefault =
 	.bPosixLocking = true,
 	.bShareModes = true,
 	.bOpLocks = true,
-	.bKernelOplocks = true,
+	.bKernelOplocks = false,
 	.bLevel2OpLocks = true,
 	.bOnlyUser = false,
 	.bMangledNames = true,


-- 
Samba Shared Repository