diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 17:50:06 +1100 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 17:50:31 +1100 |
commit | 873feea09ebc980cbd3631b767356ce1eee65ec1 (patch) | |
tree | 59a8fce9b138086abee7cf845f62ff70a390cf81 /fs/notify | |
parent | ceb5bdc2d246f6d81cf61ed70f325308a11821d2 (diff) | |
download | linux-3.10-873feea09ebc980cbd3631b767356ce1eee65ec1.tar.gz linux-3.10-873feea09ebc980cbd3631b767356ce1eee65ec1.tar.bz2 linux-3.10-873feea09ebc980cbd3631b767356ce1eee65ec1.zip |
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 9be6ec1f36d..79b47cbb5cd 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -59,7 +59,7 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode) /* determine if the children should tell inode about their events */ watched = fsnotify_inode_watches_children(inode); - spin_lock(&dcache_inode_lock); + spin_lock(&inode->i_lock); /* run all of the dentries associated with this inode. Since this is a * directory, there damn well better only be one item on this list */ list_for_each_entry(alias, &inode->i_dentry, d_alias) { @@ -82,7 +82,7 @@ void __fsnotify_update_child_dentry_flags(struct inode *inode) } spin_unlock(&alias->d_lock); } - spin_unlock(&dcache_inode_lock); + spin_unlock(&inode->i_lock); } /* Notify this dentry's parent about a child's events. */ |