diff options
| author | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-01 15:47:09 -0700 |
| commit | aadf030d84352a91cdadf50f947da739c5611450 (patch) | |
| tree | 5f22ec57ee257776b4c157f0c91f3612f05ed6c5 /fs/eventpoll.c | |
| parent | aad2732ba0dddcf3446a4e3c4843496759c1c305 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge commit 'v3.4-rc5' into android-3.4
Diffstat (limited to 'fs/eventpoll.c')
| -rw-r--r-- | fs/eventpoll.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 739b0985b39..c0b3c70ee87 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1663,8 +1663,10 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, if (op == EPOLL_CTL_ADD) { if (is_file_epoll(tfile)) { error = -ELOOP; - if (ep_loop_check(ep, tfile) != 0) + if (ep_loop_check(ep, tfile) != 0) { + clear_tfile_check_list(); goto error_tgt_fput; + } } else list_add(&tfile->f_tfile_llink, &tfile_check_list); } |