From c2b38989cf2b0c003a9cf57efc833ab16d33901e Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Thu, 24 May 2007 12:21:43 -0400 Subject: Documentation: Fix up docs still talking about i_sem .. it got changed to 'i_mutex' some time ago. Signed-off-by: Josef 'Jeff' Sipek Signed-off-by: Linus Torvalds --- Documentation/filesystems/directory-locking | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation/filesystems/directory-locking') diff --git a/Documentation/filesystems/directory-locking b/Documentation/filesystems/directory-locking index d7099a9266f..ff7b611abf3 100644 --- a/Documentation/filesystems/directory-locking +++ b/Documentation/filesystems/directory-locking @@ -1,5 +1,6 @@ Locking scheme used for directory operations is based on two -kinds of locks - per-inode (->i_sem) and per-filesystem (->s_vfs_rename_sem). +kinds of locks - per-inode (->i_mutex) and per-filesystem +(->s_vfs_rename_mutex). For our purposes all operations fall in 5 classes: @@ -63,7 +64,7 @@ objects - A < B iff A is an ancestor of B. attempt to acquire some lock and already holds at least one lock. Let's consider the set of contended locks. First of all, filesystem lock is not contended, since any process blocked on it is not holding any locks. -Thus all processes are blocked on ->i_sem. +Thus all processes are blocked on ->i_mutex. Non-directory objects are not contended due to (3). Thus link creation can't be a part of deadlock - it can't be blocked on source -- cgit v1.2.3