aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-09-30 22:18:55 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-10-09 18:32:45 -0400
commit98257af5a2ad0c5b502ebd07094d9fd8ce87acef (patch)
treec8ae7b8517ad2f2d6e1cad13b9f15d6b2ebb4e64
parent9efa68ed079af97f4e9477eadef567ffe64f7afc (diff)
Documentation: move locks.txt in filesystems/
This documentation (about file locking) belongs in filesystems/. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--Documentation/00-INDEX2
-rw-r--r--Documentation/filesystems/00-INDEX2
-rw-r--r--Documentation/filesystems/locks.txt (renamed from Documentation/locks.txt)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 910473cb1c1c..cc10ce7dc339 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -230,8 +230,6 @@ local_ops.txt
230 - semantics and behavior of local atomic operations. 230 - semantics and behavior of local atomic operations.
231lockdep-design.txt 231lockdep-design.txt
232 - documentation on the runtime locking correctness validator. 232 - documentation on the runtime locking correctness validator.
233locks.txt
234 - info on file locking implementations, flock() vs. fcntl(), etc.
235logo.gif 233logo.gif
236 - full colour GIF image of Linux logo (penguin - Tux). 234 - full colour GIF image of Linux logo (penguin - Tux).
237logo.txt 235logo.txt
diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index e801076812a4..599593a17067 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -52,6 +52,8 @@ isofs.txt
52 - info and mount options for the ISO 9660 (CDROM) filesystem. 52 - info and mount options for the ISO 9660 (CDROM) filesystem.
53jfs.txt 53jfs.txt
54 - info and mount options for the JFS filesystem. 54 - info and mount options for the JFS filesystem.
55locks.txt
56 - info on file locking implementations, flock() vs. fcntl(), etc.
55mandatory-locking.txt 57mandatory-locking.txt
56 - info on the Linux implementation of Sys V mandatory file locking. 58 - info on the Linux implementation of Sys V mandatory file locking.
57ncpfs.txt 59ncpfs.txt
diff --git a/Documentation/locks.txt b/Documentation/filesystems/locks.txt
index fab857accbd6..fab857accbd6 100644
--- a/Documentation/locks.txt
+++ b/Documentation/filesystems/locks.txt