|
On Wed, Apr 17, 2013 at 11:50:48PM +0300, Julian Anastasov wrote:
> Fix sparse warnings while changing the
> size between host and network order:
>
> net/netfilter/ipvs/ip_vs_sync.c:1179:20: warning: cast to restricted __be16
> net/netfilter/ipvs/ip_vs_sync.c:1179:20: warning: cast to restricted __be16
> net/netfilter/ipvs/ip_vs_sync.c:1179:20: warning: cast to restricted __be16
> net/netfilter/ipvs/ip_vs_sync.c:1179:20: warning: cast to restricted __be16
> net/netfilter/ipvs/ip_vs_sync.c:1550:19: warning: incorrect type in
> assignment (different base types)
> net/netfilter/ipvs/ip_vs_sync.c:1550:19: expected unsigned short
> [unsigned] [usertype] size
> net/netfilter/ipvs/ip_vs_sync.c:1550:19: got restricted __be16
> [usertype] <noident>
>
> Signed-off-by: Julian Anastasov <ja@xxxxxx>
I'm not very excited by the use of __force.
Can't we change the type of the size element
of struct ip_vs_sync_mesg and use the sparse annotations
to our advantage?
> ---
> net/netfilter/ipvs/ip_vs_sync.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index 8e57077..ff7f2ad 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -1176,7 +1176,7 @@ static void ip_vs_process_message(struct net *net, __u8
> *buffer,
> return;
> }
> /* Convert size back to host byte order */
> - m2->size = ntohs(m2->size);
> + m2->size = ntohs((__force __be16) m2->size);
>
> if (buflen != m2->size) {
> IP_VS_DBG(2, "BACKUP, bogus message size\n");
> @@ -1547,7 +1547,7 @@ ip_vs_send_sync_msg(struct socket *sock, struct
> ip_vs_sync_mesg *msg)
> msize = msg->size;
>
> /* Put size in network byte order */
> - msg->size = htons(msg->size);
> + msg->size = (__force __u16) htons(msg->size);
>
> ret = ip_vs_send_async(sock, (char *)msg, msize);
> if (ret >= 0 || ret == -EAGAIN)
> --
> 1.7.3.4
>
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
