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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
dnotify.c
diff --git
a/fs/dnotify.c
b/fs/dnotify.c
index
f3b540d
..
936409f
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
struct kmem_cache *dn_cache __read_mostly
;
static void redo_inode_mask(struct inode *inode)
{
static void redo_inode_mask(struct inode *inode)
{
@@
-42,7
+42,7
@@
void dnotify_flush(struct file *filp, fl_owner_t id)
struct dnotify_struct **prev;
struct inode *inode;
struct dnotify_struct **prev;
struct inode *inode;
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_
path.
dentry->d_inode;
if (!S_ISDIR(inode->i_mode))
return;
spin_lock(&inode->i_lock);
if (!S_ISDIR(inode->i_mode))
return;
spin_lock(&inode->i_lock);
@@
-74,10
+74,10
@@
int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
}
if (!dir_notify_enable)
return -EINVAL;
}
if (!dir_notify_enable)
return -EINVAL;
- inode = filp->f_dentry->d_inode;
+ inode = filp->f_
path.
dentry->d_inode;
if (!S_ISDIR(inode->i_mode))
return -ENOTDIR;
if (!S_ISDIR(inode->i_mode))
return -ENOTDIR;
- dn = kmem_cache_alloc(dn_cache,
SLAB
_KERNEL);
+ dn = kmem_cache_alloc(dn_cache,
GFP
_KERNEL);
if (dn == NULL)
return -ENOMEM;
spin_lock(&inode->i_lock);
if (dn == NULL)
return -ENOMEM;
spin_lock(&inode->i_lock);
@@
-92,7
+92,7
@@
int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
prev = &odn->dn_next;
}
prev = &odn->dn_next;
}
- error =
f_setown(filp, current->pid
, 0);
+ error =
__f_setown(filp, task_pid(current), PIDTYPE_PID
, 0);
if (error)
goto out_free;
if (error)
goto out_free;