diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:06 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:31 -0500 |
commit | 873feea09ebc980cbd3631b767356ce1eee65ec1 (patch) | |
tree | 59a8fce9b138086abee7cf845f62ff70a390cf81 /fs/notify | |
parent | ceb5bdc2d246f6d81cf61ed70f325308a11821d2 (diff) |
fs: dcache per-inode inode alias locking
dcache_inode_lock can be replaced with per-inode locking. Use existing
inode->i_lock for this. This is slightly non-trivial because we sometimes
need to find the inode from the dentry, which requires d_inode to be
stabilised (either with refcount or d_lock).
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/notify')
-rw-r--r-- | fs/notify/fsnotify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index 9be6ec1f36d8..79b47cbb5cd8 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c | |||
@@ -59,7 +59,7 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode) | |||
59 | /* determine if the children should tell inode about their events */ | 59 | /* determine if the children should tell inode about their events */ |
60 | watched = fsnotify_inode_watches_children(inode); | 60 | watched = fsnotify_inode_watches_children(inode); |
61 | 61 | ||
62 | spin_lock(&dcache_inode_lock); | 62 | spin_lock(&inode->i_lock); |
63 | /* run all of the dentries associated with this inode. Since this is a | 63 | /* run all of the dentries associated with this inode. Since this is a |
64 | * directory, there damn well better only be one item on this list */ | 64 | * directory, there damn well better only be one item on this list */ |
65 | list_for_each_entry(alias, &inode->i_dentry, d_alias) { | 65 | list_for_each_entry(alias, &inode->i_dentry, d_alias) { |
@@ -82,7 +82,7 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode) | |||
82 | } | 82 | } |
83 | spin_unlock(&alias->d_lock); | 83 | spin_unlock(&alias->d_lock); |
84 | } | 84 | } |
85 | spin_unlock(&dcache_inode_lock); | 85 | spin_unlock(&inode->i_lock); |
86 | } | 86 | } |
87 | 87 | ||
88 | /* Notify this dentry's parent about a child's events. */ | 88 | /* Notify this dentry's parent about a child's events. */ |