Commit c2b38989cf2b0c003a9cf57efc833ab16d33901e
Committed by
Linus Torvalds
Linus Torvalds
1 parent
8f53b6fcc4
Exists in
master
and in
4 other branches
Documentation: Fix up docs still talking about i_sem
.. it got changed to 'i_mutex' some time ago. Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 7 additions and 6 deletions Side-by-side Diff
Documentation/filesystems/directory-locking
| 1 | 1 | Locking scheme used for directory operations is based on two |
| 2 | -kinds of locks - per-inode (->i_sem) and per-filesystem (->s_vfs_rename_sem). | |
| 2 | +kinds of locks - per-inode (->i_mutex) and per-filesystem | |
| 3 | +(->s_vfs_rename_mutex). | |
| 3 | 4 | |
| 4 | 5 | For our purposes all operations fall in 5 classes: |
| 5 | 6 | |
| ... | ... | @@ -63,7 +64,7 @@ |
| 63 | 64 | attempt to acquire some lock and already holds at least one lock. Let's |
| 64 | 65 | consider the set of contended locks. First of all, filesystem lock is |
| 65 | 66 | not contended, since any process blocked on it is not holding any locks. |
| 66 | -Thus all processes are blocked on ->i_sem. | |
| 67 | +Thus all processes are blocked on ->i_mutex. | |
| 67 | 68 | |
| 68 | 69 | Non-directory objects are not contended due to (3). Thus link |
| 69 | 70 | creation can't be a part of deadlock - it can't be blocked on source |
Documentation/filesystems/porting
| ... | ... | @@ -107,7 +107,7 @@ |
| 107 | 107 | --- |
| 108 | 108 | [informational] |
| 109 | 109 | |
| 110 | -->link() callers hold ->i_sem on the object we are linking to. Some of your | |
| 110 | +->link() callers hold ->i_mutex on the object we are linking to. Some of your | |
| 111 | 111 | problems might be over... |
| 112 | 112 | |
| 113 | 113 | --- |
| ... | ... | @@ -130,9 +130,9 @@ |
| 130 | 130 | --- |
| 131 | 131 | [mandatory] |
| 132 | 132 | |
| 133 | -->setattr() is called without BKL now. Caller _always_ holds ->i_sem, so | |
| 134 | -watch for ->i_sem-grabbing code that might be used by your ->setattr(). | |
| 135 | -Callers of notify_change() need ->i_sem now. | |
| 133 | +->setattr() is called without BKL now. Caller _always_ holds ->i_mutex, so | |
| 134 | +watch for ->i_mutex-grabbing code that might be used by your ->setattr(). | |
| 135 | +Callers of notify_change() need ->i_mutex now. | |
| 136 | 136 | |
| 137 | 137 | --- |
| 138 | 138 | [recommended] |