From 7d91d555c3c03f4c4987e0d215fa6ee4907ccedb Mon Sep 17 00:00:00 2001 From: Robert Love Date: Wed, 13 Jul 2005 13:49:23 -0400 Subject: [PATCH] --- yaml --- r: 4771 b: refs/heads/master c: 9a556e89081b0c1c2f83cee915363b15a68a6f2d h: refs/heads/master i: 4769: 8fb9bd5ef09a82f966dbef1969eea7dc2dcd6120 4767: a21694dd488d5c9c7141200c741a05f81ba95d64 v: v3 --- [refs] | 2 +- trunk/fs/inotify.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c548852a9eed..3a0fc284b535 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5995f16b4a464c8a57de7c9d5ddf4758dbacad41 +refs/heads/master: 9a556e89081b0c1c2f83cee915363b15a68a6f2d diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c index fb4803131423..54757be888b6 100644 --- a/trunk/fs/inotify.c +++ b/trunk/fs/inotify.c @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include #include #include @@ -934,7 +932,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char *path, u32 mask) dev = filp->private_data; - ret = find_inode ((const char __user*)path, &nd); + ret = find_inode((const char __user*) path, &nd); if (ret) goto fput_and_out; @@ -991,8 +989,9 @@ asmlinkage long sys_inotify_rm_watch(int fd, u32 wd) if (!filp) return -EBADF; dev = filp->private_data; - ret = inotify_ignore (dev, wd); + ret = inotify_ignore(dev, wd); fput(filp); + return ret; } @@ -1032,8 +1031,6 @@ static int __init inotify_init(void) sizeof(struct inotify_kernel_event), 0, SLAB_PANIC, NULL, NULL); - printk(KERN_INFO "inotify syscall\n"); - return 0; }