patch-2.2.12 linux/Documentation/locks.txt

• Lines: 39
• Date: Wed Aug 25 17:29:45 1999
• Orig file: v2.2.11/linux/Documentation/locks.txt
• Orig date: Thu Jan 7 08:41:54 1999

diff -u --recursive --new-file v2.2.11/linux/Documentation/locks.txt linux/Documentation/locks.txt
@@ -13,12 +13,11 @@
 
 The old flock(2) emulation in the kernel was swapped for proper BSD
 compatible flock(2) support in the 1.3.x series of kernels. With the
-release of the 2.1.x kernel series, support for the old emulation has
-been totally removed, so that we don't need to carry this baggage
-forever.
+release of the 2.1.x kernel series, support for the old emulation was
+totally removed, so that we don't need to carry this baggage forever.
 
-This should not cause problems for anybody, since everybody using a
-2.1.x kernel should have updated their C library to a suitable version
+This should not cause problems for anybody, since everybody using a 2.1.x
+or 2.2.x kernel should have updated their C library to a suitable version
 anyway (see the file "linux/Documentation/Changes".)
 
 1.2 Allow Mixed Locks Again
@@ -31,9 +30,9 @@
 for example. This gave rise to some other subtle problems if sendmail was
 configured to rebuild the alias file. Sendmail tried to lock the aliases.dir
 file with fcntl() at the same time as the GDBM routines tried to lock this
-file with flock(). With pre 1.3.96 kernels this could result in deadlocks that,
-over time, or under a very heavy mail load, would eventually cause the kernel
-to lock solid with deadlocked processes.
+file with flock(). With kernels before 1.3.96 this could result in deadlocks
+that, over time or under a very heavy mail load, would eventually cause the
+kernel to lock solid with deadlocked processes.
 
 
 1.2.2 The Solution
@@ -60,7 +59,7 @@
 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'.
+on a per-file-system basis, using the mount options 'mand' and 'nomand'.
 The default is to disallow mandatory locking. The intention is that
 mandatory locking only be enabled on a local filesystem as the specific need
 arises.