Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / fs / notify / inotify / inotify_user.c

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 1d1d1a2765dd28bc0a5551b4d77cb3268e3a0948..5ef5f365a5c86acb32813e7ff9b11d713f54f21b 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -741,10 +741,6 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,
 
        /* create/update an inode mark */
        ret = inotify_update_watch(group, inode, mask);
-       if (unlikely(ret))
-               goto path_put_and_out;
-
-path_put_and_out:
        path_put(&path);
 fput_and_out:
        fput_light(filp, fput_needed);