diff options
| -rw-r--r-- | usr/src/lib/libc/port/sys/eventfd.c | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/io/eventfd.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/eventfd.h | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/usr/src/lib/libc/port/sys/eventfd.c b/usr/src/lib/libc/port/sys/eventfd.c index bd2eba4efa..f165491cc1 100644 --- a/usr/src/lib/libc/port/sys/eventfd.c +++ b/usr/src/lib/libc/port/sys/eventfd.c @@ -10,7 +10,7 @@ */ /* - * Copyright (c) 2014, Joyent, Inc. All rights reserved. + * Copyright (c) 2015, Joyent, Inc. All rights reserved. */ #include <sys/eventfd.h> @@ -26,8 +26,10 @@ eventfd(unsigned int initval, int flags) uint64_t val = initval; int fd; - if (flags & ~(EFD_NONBLOCK | EFD_CLOEXEC | EFD_SEMAPHORE)) - return (EINVAL); + if (flags & ~(EFD_NONBLOCK | EFD_CLOEXEC | EFD_SEMAPHORE)) { + errno = EINVAL; + return (-1); + } if (flags & EFD_NONBLOCK) oflags |= O_NONBLOCK; diff --git a/usr/src/uts/common/io/eventfd.c b/usr/src/uts/common/io/eventfd.c index e452154bf0..5c7eab54c2 100644 --- a/usr/src/uts/common/io/eventfd.c +++ b/usr/src/uts/common/io/eventfd.c @@ -10,7 +10,7 @@ */ /* - * Copyright (c) 2014 Joyent, Inc. All rights reserved. + * Copyright (c) 2015 Joyent, Inc. All rights reserved. */ /* @@ -57,7 +57,7 @@ eventfd_open(dev_t *devp, int flag, int otyp, cred_t *cred_p) major_t major = getemajor(*devp); minor_t minor = getminor(*devp); - if (minor != EVENTFDMNRN_INOTIFY) + if (minor != EVENTFDMNRN_EVENTFD) return (ENXIO); mutex_enter(&eventfd_lock); @@ -278,7 +278,7 @@ eventfd_attach(dev_info_t *devi, ddi_attach_cmd_t cmd) } if (ddi_create_minor_node(devi, "eventfd", S_IFCHR, - EVENTFDMNRN_INOTIFY, DDI_PSEUDO, NULL) == DDI_FAILURE) { + EVENTFDMNRN_EVENTFD, DDI_PSEUDO, NULL) == DDI_FAILURE) { cmn_err(CE_NOTE, "/dev/eventfd couldn't create minor node"); ddi_soft_state_fini(&eventfd_softstate); mutex_exit(&eventfd_lock); diff --git a/usr/src/uts/common/sys/eventfd.h b/usr/src/uts/common/sys/eventfd.h index c7dbaf947f..1b0d961b0b 100644 --- a/usr/src/uts/common/sys/eventfd.h +++ b/usr/src/uts/common/sys/eventfd.h @@ -10,7 +10,7 @@ */ /* - * Copyright (c) 2014 Joyent, Inc. All rights reserved. + * Copyright (c) 2015 Joyent, Inc. All rights reserved. */ /* @@ -55,7 +55,7 @@ extern int eventfd_write(int, eventfd_t); #else -#define EVENTFDMNRN_INOTIFY 0 +#define EVENTFDMNRN_EVENTFD 0 #define EVENTFDMNRN_CLONE 1 #define EVENTFD_VALMAX (ULLONG_MAX - 1ULL) |