summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/locks.txt
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2011-08-15 02:02:26 +0200
committerJiri Kosina <jkosina@suse.cz>2011-09-27 18:08:04 +0200
commit395cf9691d72173d8cdaa613c5f0255f993af94b (patch)
tree813be524794fe1c0850805d7faca90e45fd0e60b /Documentation/filesystems/locks.txt
parente060c38434b2caa78efe7cedaff4191040b65a15 (diff)
downloadlinux-stable-395cf9691d72173d8cdaa613c5f0255f993af94b.tar.gz
linux-stable-395cf9691d72173d8cdaa613c5f0255f993af94b.tar.bz2
linux-stable-395cf9691d72173d8cdaa613c5f0255f993af94b.zip
doc: fix broken references
There are numerous broken references to Documentation files (in other Documentation files, in comments, etc.). These broken references are caused by typo's in the references, and by renames or removals of the Documentation files. Some broken references are simply odd. Fix these broken references, sometimes by dropping the irrelevant text they were part of. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/filesystems/locks.txt')
-rw-r--r--Documentation/filesystems/locks.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/filesystems/locks.txt b/Documentation/filesystems/locks.txt
index fab857accbd6..2cf81082581d 100644
--- a/Documentation/filesystems/locks.txt
+++ b/Documentation/filesystems/locks.txt
@@ -53,11 +53,12 @@ fcntl(), with all the problems that implies.
1.3 Mandatory Locking As A Mount Option
---------------------------------------
-Mandatory locking, as described in 'Documentation/filesystems/mandatory.txt'
-was prior to this release a general configuration option that was valid for
-all mounted filesystems. This had a number of inherent dangers, not the
-least of which was the ability to freeze an NFS server by asking it to read
-a file for which a mandatory lock existed.
+Mandatory locking, as described in
+'Documentation/filesystems/mandatory-locking.txt' was prior to this release a
+general configuration option that was valid for all mounted filesystems. This
+had a number of inherent dangers, not the least of which was the ability to
+freeze an NFS server by asking it to read a file for which a mandatory lock
+existed.
From this release of the kernel, mandatory locking can be turned on and off
on a per-filesystem basis, using the mount options 'mand' and 'nomand'.