aboutsummaryrefslogtreecommitdiffstats
path: root/fs/inotify.c
diff options
context:
space:
mode:
authorRobert Love <rml@novell.com>2005-07-13 13:49:23 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-13 14:09:31 -0400
commit9a556e89081b0c1c2f83cee915363b15a68a6f2d (patch)
tree74e2f68c4d04ab0fcf05dbd4f82c14169d639405 /fs/inotify.c
parent5995f16b4a464c8a57de7c9d5ddf4758dbacad41 (diff)
[PATCH] inotify: misc cleanup
Really simple, basic cleanup. Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/inotify.c')
-rw-r--r--fs/inotify.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/inotify.c b/fs/inotify.c
index fb4803131423..54757be888b6 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -29,8 +29,6 @@
29#include <linux/mount.h> 29#include <linux/mount.h>
30#include <linux/namei.h> 30#include <linux/namei.h>
31#include <linux/poll.h> 31#include <linux/poll.h>
32#include <linux/device.h>
33#include <linux/miscdevice.h>
34#include <linux/init.h> 32#include <linux/init.h>
35#include <linux/list.h> 33#include <linux/list.h>
36#include <linux/writeback.h> 34#include <linux/writeback.h>
@@ -934,7 +932,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char *path, u32 mask)
934 932
935 dev = filp->private_data; 933 dev = filp->private_data;
936 934
937 ret = find_inode ((const char __user*)path, &nd); 935 ret = find_inode((const char __user*) path, &nd);
938 if (ret) 936 if (ret)
939 goto fput_and_out; 937 goto fput_and_out;
940 938
@@ -991,8 +989,9 @@ asmlinkage long sys_inotify_rm_watch(int fd, u32 wd)
991 if (!filp) 989 if (!filp)
992 return -EBADF; 990 return -EBADF;
993 dev = filp->private_data; 991 dev = filp->private_data;
994 ret = inotify_ignore (dev, wd); 992 ret = inotify_ignore(dev, wd);
995 fput(filp); 993 fput(filp);
994
996 return ret; 995 return ret;
997} 996}
998 997
@@ -1032,8 +1031,6 @@ static int __init inotify_init(void)
1032 sizeof(struct inotify_kernel_event), 1031 sizeof(struct inotify_kernel_event),
1033 0, SLAB_PANIC, NULL, NULL); 1032 0, SLAB_PANIC, NULL, NULL);
1034 1033
1035 printk(KERN_INFO "inotify syscall\n");
1036
1037 return 0; 1034 return 0;
1038} 1035}
1039 1036