Git commit 1089ec4d39e6025aa33447434ad02af074d484be by Alexander Reinholdt. Committed on 04/01/2023 at 09:36. Pushed by areinholdt into branch 'master'.
Fix problems with using 'nolock' option with mount.cifs. BUG: 463637 M +1 -1 core/smb4kmounter.cpp M +2 -2 core/smb4kmountsettings_linux.kcfg M +2 -2 doc/index.docbook https://invent.kde.org/network/smb4k/commit/1089ec4d39e6025aa33447434ad02af074d484be diff --git a/core/smb4kmounter.cpp b/core/smb4kmounter.cpp index 65bfeec0..5391399d 100644 --- a/core/smb4kmounter.cpp +++ b/core/smb4kmounter.cpp @@ -1219,7 +1219,7 @@ bool Smb4KMounter::fillMountActionArgs(const SharePtr &share, QVariantMap &map) // Locking // if (Smb4KMountSettings::noLocking()) { - argumentsList << QStringLiteral("nolock"); + argumentsList << QStringLiteral("nobrl"); } // diff --git a/core/smb4kmountsettings_linux.kcfg b/core/smb4kmountsettings_linux.kcfg index 99b0c84f..3b944e71 100644 --- a/core/smb4kmountsettings_linux.kcfg +++ b/core/smb4kmountsettings_linux.kcfg @@ -183,8 +183,8 @@ <default>true</default> </entry> <entry name="NoLocking" type="Bool"> - <label>Do not use locking</label> - <whatsthis>Do not use locking. Do not start lockd.</whatsthis> + <label>Do not send byte range lock requests</label> + <whatsthis>Do not send byte range lock requests to the server. This is necessary for certain applications that break with cifs style mandatory byte range locks (and most cifs servers do not yet support requesting advisory byte range locks).</whatsthis> <default>false</default> </entry> <entry name="TranslateReservedChars" type="Bool"> diff --git a/doc/index.docbook b/doc/index.docbook index 98d724a7..60f7b437 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -2470,10 +2470,10 @@ ntlm auth = yes </varlistentry> <varlistentry> <term> - <menuchoice><guibutton>Do not use locking</guibutton></menuchoice> + <menuchoice><guibutton>Do not send byte range lock requests</guibutton></menuchoice> </term> <listitem> - <para>Do not use locking. Do not start lockd.</para> + <para>Do not send byte range lock requests to the server. This is necessary for certain applications that break with cifs style mandatory byte range locks (and most cifs servers do not yet support requesting advisory byte range locks).</para> <para>Default: not selected</para> </listitem> </varlistentry>
