leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] inotify speedup

Browse Source 
Bypass an inotify-related fastpath spinlock and several function calls on
systems which have no inotify watches registered.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
John McCutchan 2005-09-06 15:16:38 -07:00 committed by Linus Torvalds
parent 19306059cd
commit 820249bafe
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/inotify.c
View File

@ -37,6 +37,7 @@
#include <asm/ioctls.h> #include <asm/ioctls.h>
static atomic_t inotify_cookie; static atomic_t inotify_cookie;
static atomic_t inotify_watches;
static kmem_cache_t *watch_cachep; static kmem_cache_t *watch_cachep;
static kmem_cache_t *event_cachep; static kmem_cache_t *event_cachep;
@ -422,6 +423,7 @@ static struct inotify_watch *create_watch(struct inotify_device *dev,
get_inotify_watch(watch); get_inotify_watch(watch);
atomic_inc(&dev->user->inotify_watches); atomic_inc(&dev->user->inotify_watches);
atomic_inc(&inotify_watches);
return watch; return watch;
} }
@ -454,6 +456,7 @@ static void remove_watch_no_event(struct inotify_watch *watch,
list_del(&watch->d_list); list_del(&watch->d_list);
atomic_dec(&dev->user->inotify_watches); atomic_dec(&dev->user->inotify_watches);
atomic_dec(&inotify_watches);
idr_remove(&dev->idr, watch->wd); idr_remove(&dev->idr, watch->wd);
put_inotify_watch(watch); put_inotify_watch(watch);
} }
@ -532,6 +535,9 @@ void inotify_dentry_parent_queue_event(struct dentry *dentry, u32 mask,
struct dentry *parent; struct dentry *parent;
struct inode *inode; struct inode *inode;
if (!atomic_read (&inotify_watches))
return;
spin_lock(&dentry->d_lock); spin_lock(&dentry->d_lock);
parent = dentry->d_parent; parent = dentry->d_parent;
inode = parent->d_inode; inode = parent->d_inode;
@ -1043,6 +1049,7 @@ static int __init inotify_setup(void)
inotify_max_user_watches = 8192; inotify_max_user_watches = 8192;
atomic_set(&inotify_cookie, 0); atomic_set(&inotify_cookie, 0);
atomic_set(&inotify_watches, 0);
watch_cachep = kmem_cache_create("inotify_watch_cache", watch_cachep = kmem_cache_create("inotify_watch_cache",
sizeof(struct inotify_watch), sizeof(struct inotify_watch),