diff options
Diffstat (limited to 'fs/dnotify.c')
-rw-r--r-- | fs/dnotify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/dnotify.c b/fs/dnotify.c index 2b0442db67e0..936409fcd939 100644 --- a/fs/dnotify.c +++ b/fs/dnotify.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | int dir_notify_enable __read_mostly = 1; | 24 | int dir_notify_enable __read_mostly = 1; |
25 | 25 | ||
26 | static kmem_cache_t *dn_cache __read_mostly; | 26 | static struct kmem_cache *dn_cache __read_mostly; |
27 | 27 | ||
28 | static void redo_inode_mask(struct inode *inode) | 28 | static void redo_inode_mask(struct inode *inode) |
29 | { | 29 | { |
@@ -42,7 +42,7 @@ void dnotify_flush(struct file *filp, fl_owner_t id) | |||
42 | struct dnotify_struct **prev; | 42 | struct dnotify_struct **prev; |
43 | struct inode *inode; | 43 | struct inode *inode; |
44 | 44 | ||
45 | inode = filp->f_dentry->d_inode; | 45 | inode = filp->f_path.dentry->d_inode; |
46 | if (!S_ISDIR(inode->i_mode)) | 46 | if (!S_ISDIR(inode->i_mode)) |
47 | return; | 47 | return; |
48 | spin_lock(&inode->i_lock); | 48 | spin_lock(&inode->i_lock); |
@@ -74,10 +74,10 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg) | |||
74 | } | 74 | } |
75 | if (!dir_notify_enable) | 75 | if (!dir_notify_enable) |
76 | return -EINVAL; | 76 | return -EINVAL; |
77 | inode = filp->f_dentry->d_inode; | 77 | inode = filp->f_path.dentry->d_inode; |
78 | if (!S_ISDIR(inode->i_mode)) | 78 | if (!S_ISDIR(inode->i_mode)) |
79 | return -ENOTDIR; | 79 | return -ENOTDIR; |
80 | dn = kmem_cache_alloc(dn_cache, SLAB_KERNEL); | 80 | dn = kmem_cache_alloc(dn_cache, GFP_KERNEL); |
81 | if (dn == NULL) | 81 | if (dn == NULL) |
82 | return -ENOMEM; | 82 | return -ENOMEM; |
83 | spin_lock(&inode->i_lock); | 83 | spin_lock(&inode->i_lock); |