Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Kuniyuki Iwashima <kuniyu@amazon.com>
To:     <xu.xin.sc@gmail.com>
CC:     <asml.silence@gmail.com>, <ast@kernel.org>, <davem@davemloft.net>,
        <dsahern@kernel.org>, <edumazet@google.com>, <kuba@kernel.org>,
        <kuniyu@amazon.com>, <linux-kernel@vger.kernel.org>,
        <martin.lau@kernel.org>, <netdev@vger.kernel.org>,
        <pabeni@redhat.com>, <xu.xin16@zte.com.cn>,
        <yoshfuji@linux-ipv6.org>, <zealci@zte.com.cn>,
        <zhang.yunkai@zte.com.cn>
Subject: [PATCH linux-next] net: remove useless parameter of __sock_cmsg_send The
Date:   Wed, 19 Oct 2022 10:22:52 -0700
Message-ID: <20221019172252.72890-1-kuniyu@amazon.com>
In-Reply-To: <20221019093014.389738-1-xu.xin16@zte.com.cn>
References: <20221019093014.389738-1-xu.xin16@zte.com.cn>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk

From:   xu.xin.sc@gmail.com
Date:   Wed, 19 Oct 2022 09:30:14 +0000
> From: xu xin <xu.xin16@zte.com.cn>
> 
> parameter 'msg' has never been used by __sock_cmsg_send, so we can remove it
> safely.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: xu xin <xu.xin16@zte.com.cn>
> Reviewed-by: Zhang Yunkai <zhang.yunkai@zte.com.cn>

The tail 'The' in the subject should be the head of the body.
Otherwise, looks good.

Acked-by: Kuniyuki Iwashima <kuniyu@amazon.com>


> ---
>  include/net/sock.h     | 2 +-
>  net/core/sock.c        | 4 ++--
>  net/ipv4/ip_sockglue.c | 2 +-
>  net/ipv6/datagram.c    | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/net/sock.h b/include/net/sock.h
> index 9e464f6409a7..b1dacc4d68c9 100644
> --- a/include/net/sock.h
> +++ b/include/net/sock.h
> @@ -1901,7 +1901,7 @@ static inline void sockcm_init(struct sockcm_cookie *sockc,
>  	*sockc = (struct sockcm_cookie) { .tsflags = sk->sk_tsflags };
>  }
>  
> -int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
> +int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
>  		     struct sockcm_cookie *sockc);
>  int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
>  		   struct sockcm_cookie *sockc);
> diff --git a/net/core/sock.c b/net/core/sock.c
> index a3ba0358c77c..944a9ea75f65 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -2730,7 +2730,7 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
>  }
>  EXPORT_SYMBOL(sock_alloc_send_pskb);
>  
> -int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
> +int __sock_cmsg_send(struct sock *sk, struct cmsghdr *cmsg,
>  		     struct sockcm_cookie *sockc)
>  {
>  	u32 tsflags;
> @@ -2784,7 +2784,7 @@ int sock_cmsg_send(struct sock *sk, struct msghdr *msg,
>  			return -EINVAL;
>  		if (cmsg->cmsg_level != SOL_SOCKET)
>  			continue;
> -		ret = __sock_cmsg_send(sk, msg, cmsg, sockc);
> +		ret = __sock_cmsg_send(sk, cmsg, sockc);
>  		if (ret)
>  			return ret;
>  	}
> diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
> index 6e19cad154f5..5f16807d3235 100644
> --- a/net/ipv4/ip_sockglue.c
> +++ b/net/ipv4/ip_sockglue.c
> @@ -267,7 +267,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
>  		}
>  #endif
>  		if (cmsg->cmsg_level == SOL_SOCKET) {
> -			err = __sock_cmsg_send(sk, msg, cmsg, &ipc->sockc);
> +			err = __sock_cmsg_send(sk, cmsg, &ipc->sockc);
>  			if (err)
>  				return err;
>  			continue;
> diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
> index 5ecb56522f9d..df7e032ce87d 100644
> --- a/net/ipv6/datagram.c
> +++ b/net/ipv6/datagram.c
> @@ -771,7 +771,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,
>  		}
>  
>  		if (cmsg->cmsg_level == SOL_SOCKET) {
> -			err = __sock_cmsg_send(sk, msg, cmsg, &ipc6->sockc);
> +			err = __sock_cmsg_send(sk, cmsg, &ipc6->sockc);
>  			if (err)
>  				return err;
>  			continue;
> -- 
> 2.25.1