RE: [PATCH 8/9] select/restart_block: Convert poll's timeout to u64

David Laight
2019-09-09T13:07:58Z

From: Dmitry Safonov
> Sent: 09 September 2019 11:24
>
> All preparations have been done - now poll() can set u64 timeout in
> restart_block. It allows to do the next step - unifying all timeouts in
> restart_block and provide ptrace() API to read it.
>
> Signed-off-by: Dmitry Safonov <dima@arista.com>
> ---
> fs/select.c | 27 +++++++--------------------
> include/linux/restart_block.h | 4 +---
> 2 files changed, 8 insertions(+), 23 deletions(-)
>
> diff --git a/fs/select.c b/fs/select.c
> index 4af88feaa2fe..ff2b9c4865cd 100644
> --- a/fs/select.c
> +++ b/fs/select.c
...
> @@ -1037,16 +1030,10 @@ SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
> struct restart_block *restart_block;
>
> restart_block = &current->restart_block;
> - restart_block->fn = do_restart_poll;
> - restart_block->poll.ufds = ufds;
> - restart_block->poll.nfds = nfds;
> -
> - if (timeout_msecs >= 0) {
> - restart_block->poll.tv_sec = end_time.tv_sec;
> - restart_block->poll.tv_nsec = end_time.tv_nsec;
> - restart_block->poll.has_timeout = 1;
> - } else
> - restart_block->poll.has_timeout = 0;
> + restart_block->fn = do_restart_poll;
> + restart_block->poll.ufds = ufds;
> + restart_block->poll.nfds = nfds;
> + restart_block->poll.timeout = timeout;

What is all that whitespace for?

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)