fanotify: remove useless bypass_perm check
authorJan Kara <jack@suse.cz>
Thu, 3 Apr 2014 21:46:32 +0000 (14:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2014 23:20:51 +0000 (16:20 -0700)
The prepare_for_access_response() function checks whether
group->fanotify_data.bypass_perm is set.  However this test can never be
true because prepare_for_access_response() is called only from
fanotify_read() which means fanotify group is alive with an active fd
while bypass_perm is set from fanotify_release() when all file
descriptors pointing to the group are closed and the group is going
away.

Signed-off-by: Jan Kara <jack@suse.cz>
Cc: Eric Paris <eparis@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/notify/fanotify/fanotify_user.c

index 287a22c041496a206d94daa299be55a20b4786a2..70fe65437d21ba6ce1ef10620ce5094fc5ca2897 100644 (file)
@@ -211,14 +211,6 @@ static int prepare_for_access_response(struct fsnotify_group *group,
        re->fd = fd;
 
        mutex_lock(&group->fanotify_data.access_mutex);
-
-       if (atomic_read(&group->fanotify_data.bypass_perm)) {
-               mutex_unlock(&group->fanotify_data.access_mutex);
-               kmem_cache_free(fanotify_response_event_cache, re);
-               FANOTIFY_E(event)->response = FAN_ALLOW;
-               return 0;
-       }
-               
        list_add_tail(&re->list, &group->fanotify_data.access_list);
        mutex_unlock(&group->fanotify_data.access_mutex);