git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
fs
/
dnotify.c
diff --git
a/fs/dnotify.c
b/fs/dnotify.c
index
2801eb4
..
f932591
100644
(file)
--- a/
fs/dnotify.c
+++ b/
fs/dnotify.c
@@
-21,9
+21,9
@@
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
-int dir_notify_enable = 1;
+int dir_notify_enable
__read_mostly
= 1;
-static kmem_cache_t *dn_cache;
+static kmem_cache_t *dn_cache
__read_mostly
;
static void redo_inode_mask(struct inode *inode)
{
static void redo_inode_mask(struct inode *inode)
{
@@
-104,6
+104,9
@@
int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
dn->dn_next = inode->i_dnotify;
inode->i_dnotify = dn;
spin_unlock(&inode->i_lock);
dn->dn_next = inode->i_dnotify;
inode->i_dnotify = dn;
spin_unlock(&inode->i_lock);
+
+ if (filp->f_op && filp->f_op->dir_notify)
+ return filp->f_op->dir_notify(filp, arg);
return 0;
out_free:
return 0;
out_free: