summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/eventfd.c4
-rw-r--r--include/linux/eventfd.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/eventfd.c b/fs/eventfd.c
index bd420e6478a..3ed4466177a 100644
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -203,7 +203,7 @@ asmlinkage long sys_eventfd2(unsigned int count, int flags)
int fd;
struct eventfd_ctx *ctx;
- if (flags & ~EFD_CLOEXEC)
+ if (flags & ~(EFD_CLOEXEC | EFD_NONBLOCK))
return -EINVAL;
ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
@@ -218,7 +218,7 @@ asmlinkage long sys_eventfd2(unsigned int count, int flags)
* anon_inode_getfd() will install the fd.
*/
fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx,
- flags & O_CLOEXEC);
+ flags & (O_CLOEXEC | O_NONBLOCK));
if (fd < 0)
kfree(ctx);
return fd;
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index a6c0eaedb1b..a667637b54e 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -10,11 +10,12 @@
#ifdef CONFIG_EVENTFD
-/* For O_CLOEXEC */
+/* For O_CLOEXEC and O_NONBLOCK */
#include <linux/fcntl.h>
/* Flags for eventfd2. */
#define EFD_CLOEXEC O_CLOEXEC
+#define EFD_NONBLOCK O_NONBLOCK
struct file *eventfd_fget(int fd);
int eventfd_signal(struct file *file, int n);