diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:18 -0400 |
| commit | c32f38619af6302da58835fb292b159bdd96d11f (patch) | |
| tree | a5bb4a9c51999557eaa919f27369c70811cd813c /fs/eventpoll.c | |
| parent | 761743ebc92df72053e736fce953a5d2e90099d5 (diff) | |
| parent | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (diff) | |
| download | linux-c32f38619af6302da58835fb292b159bdd96d11f.tar.gz linux-c32f38619af6302da58835fb292b159bdd96d11f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/eventpoll.c')
| -rw-r--r-- | fs/eventpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 1c8b55670804..eedec84c1809 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1654,8 +1654,8 @@ SYSCALL_DEFINE1(epoll_create1, int, flags) error = PTR_ERR(file); goto out_free_fd; } - fd_install(fd, file); ep->file = file; + fd_install(fd, file); return fd; out_free_fd: |