Messages in this thread | | | Subject | Re: [PATCH net-next v4 02/12] socket: move compat timeout handling into sock.c | From | Deepa Dinamani <> | Date | Sat, 2 Feb 2019 09:01:24 +0530 |
| |
> On Feb 2, 2019, at 12:28 AM, Willem de Bruijn <willemdebruijn.kernel@gmail.com> wrote: > >> On Fri, Feb 1, 2019 at 7:48 AM Deepa Dinamani <deepa.kernel@gmail.com> wrote: >> >> From: Arnd Bergmann <arnd@arndb.de> >> >> This is a cleanup to prepare for the addition of 64-bit time_t >> in O_SNDTIMEO/O_RCVTIMEO. The existing compat handler seems >> unnecessarily complex and error-prone, moving it all into the >> main setsockopt()/getsockopt() implementation requires half >> as much code and is easier to extend. >> >> 32-bit user space can now use old_timeval32 on both 32-bit >> and 64-bit machines, while 64-bit code can use >> __old_kernel_timeval. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> >> --- > >> @@ -1121,7 +1155,8 @@ int sock_getsockopt(struct socket *sock, int level, int optname, >> int val; >> u64 val64; >> struct linger ling; >> - struct timeval tm; >> + struct old_timeval32 tm32; >> + struct __kernel_old_timeval tm; > > nit: not used? > > same for stm added later in the series
The sock_get_timeout() should actually be passed in v instead of optval. This seems like a typo. I will post an update to fix this.
So these are needed.
Thanks, Deepa
| |