io_uring_enter: don't expose sigset_size argument

Applications should not need to care about this, we can pass it in
ourselves. Once the libc support is there, we won't expose this
parameter either.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe
2019-02-08 11:40:17 -07:00
parent f171fa43ab
commit e377c38ca7
3 changed files with 6 additions and 5 deletions

View File

@@ -47,7 +47,7 @@ struct io_uring {
*/ */
extern int io_uring_setup(unsigned entries, struct io_uring_params *p); extern int io_uring_setup(unsigned entries, struct io_uring_params *p);
extern int io_uring_enter(unsigned fd, unsigned to_submit, extern int io_uring_enter(unsigned fd, unsigned to_submit,
unsigned min_complete, unsigned flags, sigset_t *sig, size_t sigsz); unsigned min_complete, unsigned flags, sigset_t *sig);
extern int io_uring_register(int fd, unsigned int opcode, void *arg, extern int io_uring_register(int fd, unsigned int opcode, void *arg,
unsigned int nr_args); unsigned int nr_args);

View File

@@ -29,7 +29,7 @@ static int __io_uring_get_completion(struct io_uring *ring,
if (!wait) if (!wait)
break; break;
ret = io_uring_enter(ring->ring_fd, 0, 1, ret = io_uring_enter(ring->ring_fd, 0, 1,
IORING_ENTER_GETEVENTS, NULL, _NSIG / 8); IORING_ENTER_GETEVENTS, NULL);
if (ret < 0) if (ret < 0)
return -errno; return -errno;
} while (1); } while (1);
@@ -112,7 +112,7 @@ int io_uring_submit(struct io_uring *ring)
submit: submit:
return io_uring_enter(ring->ring_fd, submitted, 0, return io_uring_enter(ring->ring_fd, submitted, 0,
IORING_ENTER_GETEVENTS, NULL, _NSIG / 8); IORING_ENTER_GETEVENTS, NULL);
} }
/* /*

View File

@@ -4,6 +4,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <signal.h>
#include "compat.h" #include "compat.h"
#include "io_uring.h" #include "io_uring.h"
@@ -33,8 +34,8 @@ int io_uring_setup(unsigned int entries, struct io_uring_params *p)
} }
int io_uring_enter(int fd, unsigned int to_submit, unsigned int min_complete, int io_uring_enter(int fd, unsigned int to_submit, unsigned int min_complete,
unsigned int flags, sigset_t *sig, size_t sigsz) unsigned int flags, sigset_t *sig)
{ {
return syscall(__NR_sys_io_uring_enter, fd, to_submit, min_complete, return syscall(__NR_sys_io_uring_enter, fd, to_submit, min_complete,
flags, sig, sigsz); flags, sig, _NSIG / 8);
} }