aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
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.
531.3 Mandatory Locking As A Mount Option 531.3 Mandatory Locking As A Mount Option
54--------------------------------------- 54---------------------------------------
55 55
56Mandatory locking, as described in 'Documentation/filesystems/mandatory.txt' 56Mandatory locking, as described in
57was prior to this release a general configuration option that was valid for 57'Documentation/filesystems/mandatory-locking.txt' was prior to this release a
58all mounted filesystems. This had a number of inherent dangers, not the 58general configuration option that was valid for all mounted filesystems. This
59least of which was the ability to freeze an NFS server by asking it to read 59had a number of inherent dangers, not the least of which was the ability to
60a file for which a mandatory lock existed. 60freeze an NFS server by asking it to read a file for which a mandatory lock
61existed.
61 62
62From this release of the kernel, mandatory locking can be turned on and off 63From this release of the kernel, mandatory locking can be turned on and off
63on a per-filesystem basis, using the mount options 'mand' and 'nomand'. 64on a per-filesystem basis, using the mount options 'mand' and 'nomand'.