docs-xml: add "smbd force process locks"

Avoid a parametric option in a hot codepath.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/smbdotconf/locking/force_process_locks.xml b/docs-xml/smbdotconf/locking/force_process_locks.xml
new file mode 100644 (file)
index 0000000..f701c0a
--- /dev/null
+++ b/docs-xml/smbdotconf/locking/force_process_locks.xml
@@ -0,0 +1,19 @@
+<samba:parameter name="smbd force process locks"
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+       <para>
+       This boolean option tells <command moreinfo="none">smbd</command> whether
+       to forcefully disable the use of Open File Description locks on Linux.
+       </para>
+       <para>
+       This option should not be changed from the default unless you know what
+       you're doing.
+       </para>
+
+</description>
+
+<related>locking</related>
+<value type="default">no</value>
+</samba:parameter>

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index d7def972d0edd7f00752829bdb0d3972b137413f..ada9a5fd473881d9101ba5efc93d5236f99b85b5 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -51,15 +51,11 @@ NTSTATUS fsp_new(struct connection_struct *conn, TALLOC_CTX *mem_ctx,
                goto fail;
        }
 
-#if defined(HAVE_OFD_LOCKS)
-       fsp->fsp_flags.use_ofd_locks = true;
-       if (lp_parm_bool(SNUM(conn),
-                        "smbd",
-                        "force process locks",
-                        false)) {
-               fsp->fsp_flags.use_ofd_locks = false;
-       }
+       fsp->fsp_flags.use_ofd_locks = !lp_smbd_force_process_locks(SNUM(conn));
+#ifndef HAVE_OFD_LOCKS
+       fsp->fsp_flags.use_ofd_locks = false;
 #endif
+
        fsp->fh->ref_count = 1;
        fsp->fh->fd = -1;