Re: [PATCH net-next 1/1] net: sock: Use USEC_PER_SEC macro instead of literal 1000000

[Feng Gao]

On Tue, Feb 21, 2017 at 3:13 PM, Joe Perches  wrote:
> On Mon, 2017-02-20 at 22:33 +0800, f...@ikuai8.com wrote:
>> From: Gao Feng 
>>
>> The USEC_PER_SEC is used once in sock_set_timeout as the max value of
>> tv_usec. But there are other similar codes which use the literal
>> 100 in this file.
>> It is minor cleanup to keep consitent.
> []
>> diff --git a/net/core/sock.c b/net/core/sock.c
> []
>> @@ -367,7 +367,7 @@ static int sock_set_timeout(long *timeo_p, char __user 
>> *optval, int optlen)
>>   if (tv.tv_sec == 0 && tv.tv_usec == 0)
>>   return 0;
>>   if (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1))
>> - *timeo_p = tv.tv_sec*HZ + 
>> (tv.tv_usec+(100/HZ-1))/(100/HZ);
>> + *timeo_p = tv.tv_sec * HZ + (tv.tv_usec + (USEC_PER_SEC / HZ - 
>> 1)) / (USEC_PER_SEC / HZ);
>
> Maybe convert this to DIV_ROUND_UP one day too?
>
> *timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / 
> HZ);
>

Good idea, thanks.
I would send v2 update.

Regards
Feng

Re: [PATCH net-next 1/1] net: sock: Use USEC_PER_SEC macro instead of literal 1000000

[Joe Perches]

On Mon, 2017-02-20 at 22:33 +0800, f...@ikuai8.com wrote:
> From: Gao Feng 
> 
> The USEC_PER_SEC is used once in sock_set_timeout as the max value of
> tv_usec. But there are other similar codes which use the literal
> 100 in this file.
> It is minor cleanup to keep consitent.
[]
> diff --git a/net/core/sock.c b/net/core/sock.c
[]
> @@ -367,7 +367,7 @@ static int sock_set_timeout(long *timeo_p, char __user 
> *optval, int optlen)
>   if (tv.tv_sec == 0 && tv.tv_usec == 0)
>   return 0;
>   if (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT/HZ - 1))
> - *timeo_p = tv.tv_sec*HZ + 
> (tv.tv_usec+(100/HZ-1))/(100/HZ);
> + *timeo_p = tv.tv_sec * HZ + (tv.tv_usec + (USEC_PER_SEC / HZ - 
> 1)) / (USEC_PER_SEC / HZ);

Maybe convert this to DIV_ROUND_UP one day too?

*timeo_p = tv.tv_sec * HZ + DIV_ROUND_UP(tv.tv_usec, USEC_PER_SEC / HZ);