git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fs: Removing useless casts
[safe/jmp/linux-2.6]
/
fs
/
inotify_user.c
diff --git
a/fs/inotify_user.c
b/fs/inotify_user.c
index
8b83c71
..
017cb0f
100644
(file)
--- a/
fs/inotify_user.c
+++ b/
fs/inotify_user.c
@@
-187,7
+187,7
@@
static struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie,
{
struct inotify_kernel_event *kevent;
{
struct inotify_kernel_event *kevent;
- kevent = kmem_cache_alloc(event_cachep, GFP_
KERNEL
);
+ kevent = kmem_cache_alloc(event_cachep, GFP_
NOFS
);
if (unlikely(!kevent))
return NULL;
if (unlikely(!kevent))
return NULL;
@@
-380,6
+380,7
@@
static int create_watch(struct inotify_device *dev, struct inode *inode,
atomic_inc(&dev->user->inotify_watches);
atomic_inc(&dev->user->inotify_watches);
+ inotify_init_watch(&watch->wdata);
ret = inotify_add_watch(dev->ih, &watch->wdata, inode, mask);
if (ret < 0)
free_inotify_user_watch(&watch->wdata);
ret = inotify_add_watch(dev->ih, &watch->wdata, inode, mask);
if (ret < 0)
free_inotify_user_watch(&watch->wdata);
@@
-671,11
+672,11
@@
out:
return ret;
}
return ret;
}
-static
struct super_block *
+static
int
inotify_get_sb(struct file_system_type *fs_type, int flags,
inotify_get_sb(struct file_system_type *fs_type, int flags,
- const char *dev_name, void *data)
+ const char *dev_name, void *data
, struct vfsmount *mnt
)
{
{
-
return get_sb_pseudo(fs_type, "inotify", NULL, 0xBAD1DEA
);
+
return get_sb_pseudo(fs_type, "inotify", NULL, 0xBAD1DEA, mnt
);
}
static struct file_system_type inotify_fs_type = {
}
static struct file_system_type inotify_fs_type = {