treewide: Convert unscriptable /* fallthrough */ comments to fallthrough;
Subsystems (10)
cover treewide: Convert unscriptable /* fallthrough */ comments to fallthrough;
Several files in the kernel can not be perfectly scripted to convert /* fallthrough */ style comments to fallthrough; because the direct scripted conversion causes gcc to emit warnings because the fallthrough; marking is outside of an #ifdef/#endif block.
e.g.:
switch (foo) {
#ifdef CONFIG_BAR
case BAR:
...
#endif
/* fallthrough */
case BAZ:
...
}is converted via script to
switch (foo) {
#ifdef CONFIG_BAR
case BAR:
...
#endif
fallthrough;
case BAZ:
...
}gcc emits a warning for the bare fallthrough; before case BAZ: when CONFIG_BAR is not enabled.
So moving the fallthrough; conversions inside the #ifdef/#endif block avoids this warning.
These are the only warnings emitted on a treewide scripted conversion as found by the kernel-robot so applying these patches allows a treewide conversion, either as multiple discrete patches or a single large patch to eventually be done.
Joe Perches (3):
drm: drm_vm: Use fallthrough;
net: [IPv4/IPv6]: Use fallthrough;
virt: vbox: Use fallthrough;
drivers/gpu/drm/drm_vm.c | 4 ++-- drivers/virt/vboxguest/vboxguest_core.c | 2 +- drivers/virt/vboxguest/vboxguest_utils.c | 2 +- net/ipv4/af_inet.c | 4 ++-- net/ipv4/ah4.c | 2 +- net/ipv4/arp.c | 2 +- net/ipv4/devinet.c | 6 +++--- net/ipv4/fib_semantics.c | 4 ++-- net/ipv4/icmp.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_log_ipv4.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 4 ++-- net/ipv4/nexthop.c | 2 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 6 +++--- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 6 ++---- net/ipv6/ah6.c | 2 +- net/ipv6/exthdrs.c | 2 +- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_fib.c | 8 ++++---- net/ipv6/ip6mr.c | 2 +- net/ipv6/ndisc.c | 2 +- net/ipv6/netfilter/nf_log_ipv6.c | 2 +- net/ipv6/raw.c | 8 ++++---- net/ipv6/route.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 29 files changed, 45 insertions(+), 47 deletions(-)
Signature · 6 lines
2.24.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 drm: drm_vm: Use fallthrough;
Convert /* fallthrough */ style comments to fallthrough;
Convert the various uses of fallthrough comments to fallthrough;
Done via script
And by hand:
This file has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
--- drivers/gpu/drm/drm_vm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_vm.c +2 -2
@@ -595,8 +595,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) vma->vm_ops = &drm_vm_ops; break; } + fallthrough;/* to _DRM_FRAME_BUFFER... */ #endif -/* fall through - to _DRM_FRAME_BUFFER... */ case _DRM_FRAME_BUFFER:case _DRM_REGISTERS: offset =drm_core_get_reg_ofs (dev);
@@ -621,7 +621,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) vma->vm_end - vma->vm_start, vma->vm_page_prot))return -EAGAIN ; vma->vm_page_prot =drm_dma_prot (map->type, vma); -/* fall through - to _DRM_SHM */ + fallthrough;/* to _DRM_SHM */ case _DRM_SHM: vma->vm_ops = &drm_vm_shm_ops; vma->vm_private_data = (void *)map;
Signature · 1 line
2.24.0
Re: [PATCH 1/3] drm: drm_vm: Use fallthrough;
Quoted 7 lines · Joe Perches
Convert /* fallthrough */ style comments to fallthrough;
Convert the various uses of fallthrough comments to fallthrough;
Done via script
Quoted 8 lines
And by hand:
This file has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
Acked-by Daniel Vetter <[email protected]>
I'm assuming this all lands through a special pull? Or should I apply this?
-Daniel
Quoted 30 lines
--- drivers/gpu/drm/drm_vm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_vm.c +2
-2@@ -595,8 +595,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) vma->vm_ops = &drm_vm_ops; break; } + fallthrough;/* to _DRM_FRAME_BUFFER... */ #endif -/* fall through - to _DRM_FRAME_BUFFER... */ case _DRM_FRAME_BUFFER:case _DRM_REGISTERS: offset =drm_core_get_reg_ofs (dev);@@ -621,7 +621,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) vma->vm_end - vma->vm_start, vma->vm_page_prot))return -EAGAIN ; vma->vm_page_prot =drm_dma_prot (map->type, vma); -/* fall through - to _DRM_SHM */ + fallthrough;/* to _DRM_SHM */ case _DRM_SHM: vma->vm_ops = &drm_vm_shm_ops; vma->vm_private_data = (void *)map;Signature · 1 line
2.24.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm: drm_vm: Use fallthrough;
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Joe Perches
Convert /* fallthrough */ style comments to fallthrough;
Convert the various uses of fallthrough comments to fallthrough;
Done via script
And by hand:
This file has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
Quoted 8 lines
Quoted 3 lines
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>Acked-by Daniel Vetter <[email protected]>I'm assuming this all lands through a special pull? Or should I apply this?
Hi Daniel.
I think you should apply this.
The idea here is to allow a scripted conversion at some point and this patch is necessary to avoid new compiler warnings after running the script.
Re: [PATCH 1/3] drm: drm_vm: Use fallthrough;
Quoted 23 lines · Joe Perches
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Joe Perches
Convert /* fallthrough */ style comments to fallthrough;
Convert the various uses of fallthrough comments to fallthrough;
Done via script
And by hand:
This file has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
Quoted 8 lines
Quoted 3 lines
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>Acked-by Daniel Vetter <[email protected]>I'm assuming this all lands through a special pull? Or should I apply this?
Quoted 7 lines
Hi Daniel.
I think you should apply this.
The idea here is to allow a scripted conversion at some point and this patch is necessary to avoid new compiler warnings after running the script.
Ok, put into the queue but missed the 5.7 feature freeze for drm so 5.8 probably.
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm: drm_vm: Use fallthrough;
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · Joe Perches
Quoted 8 lines · Daniel Vetter
Quoted 7 lines · Joe Perches
Convert /* fallthrough */ style comments to fallthrough;
Convert the various uses of fallthrough comments to fallthrough;
Done via script
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
And by hand:
This file has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
So move the new fallthrough; inside the containing #ifdef/#endif too.
[]
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
I'm assuming this all lands through a special pull? Or should I apply this?
[]
Quoted 8 lines
Quoted 5 lines
I think you should apply this.
The idea here is to allow a scripted conversion at some point and this patch is necessary to avoid new compiler warnings after running the script.
Ok, put into the queue but missed the 5.7 feature freeze for drm so 5.8 probably.
Thanks, no worries.
Any scripted conversion like this isn't a high priority.
PATCH 2/3 net: [IPv4/IPv6]: Use fallthrough;
In reply to Joe PerchesConvert the various uses of fallthrough comments to fallthrough;
Done via script
And by hand:
net/ipv6/ip6_fib.c has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
--- net/ipv4/af_inet.c | 4 ++-- net/ipv4/ah4.c | 2 +- net/ipv4/arp.c | 2 +- net/ipv4/devinet.c | 6 +++--- net/ipv4/fib_semantics.c | 4 ++-- net/ipv4/icmp.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_log_ipv4.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 4 ++-- net/ipv4/nexthop.c | 2 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 6 +++--- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 6 ++---- net/ipv6/ah6.c | 2 +- net/ipv6/exthdrs.c | 2 +- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_fib.c | 8 ++++---- net/ipv6/ip6mr.c | 2 +- net/ipv6/ndisc.c | 2 +- net/ipv6/netfilter/nf_log_ipv6.c | 2 +- net/ipv6/raw.c | 8 ++++---- net/ipv6/route.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 26 files changed, 41 insertions(+), 43 deletions(-)
net/ipv4/af_inet.c +2 -2
@@ -872,7 +872,7 @@ int inet_shutdown(struct socket *sock, int how) err = -ENOTCONN ;/* Hack to wake up other listeners, who can poll for EPOLLHUP, even on eg. unconnected UDP sockets -- RR */ -/* fall through */ + fallthrough;default : sk->sk_shutdown |= how;if (sk->sk_prot->shutdown)
@@ -886,7 +886,7 @@ int inet_shutdown(struct socket *sock, int how)case TCP_LISTEN :if (!(how &RCV_SHUTDOWN ))break ; -/* fall through */ + fallthrough;case TCP_SYN_SENT : err = sk->sk_prot->disconnect (sk,O_NONBLOCK ); sock->state = err ?SS_DISCONNECTING :SS_UNCONNECTED ;
net/ipv4/ah4.c +1 -1
@@ -107,7 +107,7 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)if (optlen <6 )return -EINVAL ;memcpy (daddr, optptr+optlen-4 ,4 ); -/* Fall through */ + fallthrough;default :memset (optptr,0 , optlen); }
net/ipv4/arp.c +1 -1
@@ -1181,7 +1181,7 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)case SIOCSARP :if (!ns_capable (net->user_ns,CAP_NET_ADMIN ))return -EPERM ; -/* fall through */ + fallthrough;case SIOCGARP : err =copy_from_user (&r, arg,sizeof (struct arpreq ));if (err)
net/ipv4/devinet.c +3 -3
@@ -1566,11 +1566,11 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, } }ip_mc_up (in_dev); -/* fall through */ + fallthrough;case NETDEV_CHANGEADDR :if (!IN_DEV_ARP_NOTIFY (in_dev))break ; -/* fall through */ + fallthrough;case NETDEV_NOTIFY_PEERS :/* Send gratuitous ARP to notify of link change */ inetdev_send_gratuitous_arp (dev, in_dev);
@@ -1588,7 +1588,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,if (inetdev_valid_mtu (dev->mtu))break ;/* disable IP when MTU is not enough */ -/* fall through */ + fallthrough;case NETDEV_UNREGISTER :inetdev_destroy (in_dev);break ;
net/ipv4/fib_semantics.c +2 -2
@@ -1962,7 +1962,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)case NETDEV_DOWN :case NETDEV_UNREGISTER : nexthop_nh->fib_nh_flags |=RTNH_F_DEAD ; -/* fall through */ + fallthrough;case NETDEV_CHANGE : nexthop_nh->fib_nh_flags |=RTNH_F_LINKDOWN ;break ;
@@ -1984,7 +1984,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)case NETDEV_DOWN :case NETDEV_UNREGISTER : fi->fib_flags |=RTNH_F_DEAD ; -/* fall through */ + fallthrough;case NETDEV_CHANGE : fi->fib_flags |=RTNH_F_LINKDOWN ;break ;
net/ipv4/icmp.c +1 -1
@@ -865,7 +865,7 @@ static bool icmp_unreach(struct sk_buff *skb)case 3 :if (!icmp_tag_validation (iph->protocol)) goto out; -/* fall through */ + fallthrough;case 0 : info =ntohs (icmph->un.frag.mtu); }
net/ipv4/ip_output.c +1 -1
@@ -333,7 +333,7 @@ static int ip_mc_finish_output(struct net *net, struct sock *sk,switch (ret) {case NET_XMIT_CN : do_cn = true; -/* fall through */ + fallthrough;case NET_XMIT_SUCCESS :break ;default :
net/ipv4/ipmr.c +1 -1
@@ -1465,7 +1465,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,case MRT_ADD_MFC :case MRT_DEL_MFC : parent =-1 ; -/* fall through */ + fallthrough;case MRT_ADD_MFC_PROXY :case MRT_DEL_MFC_PROXY :if (optlen !=sizeof (mfc)) {
net/ipv4/netfilter/nf_log_ipv4.c +1 -1
@@ -173,7 +173,7 @@ static void dump_ipv4_packet(struct net *net, struct nf_log_buf *m,case ICMP_REDIRECT :/* Max length: 24 "GATEWAY=255.255.255.255 " */ nf_log_buf_add (m,"GATEWAY=%pI4 " , &ich->un.gateway); -/* Fall through */ + fallthrough;case ICMP_DEST_UNREACH :case ICMP_SOURCE_QUENCH :case ICMP_TIME_EXCEEDED :
net/ipv4/netfilter/nf_nat_pptp.c +2 -2
@@ -168,7 +168,7 @@ pptp_outbound_pkt(struct sk_buff *skb,pr_debug ("unknown outbound packet 0x%04x:%s\n" , msg, msg <=PPTP_MSG_MAX ? pptp_msg_name[msg] : pptp_msg_name[0 ]); -/* fall through */ + fallthrough;case PPTP_SET_LINK_INFO :/* only need to NAT in case PAC is behind NAT box */ case PPTP_START_SESSION_REQUEST :
@@ -271,7 +271,7 @@ pptp_inbound_pkt(struct sk_buff *skb,pr_debug ("unknown inbound packet %s\n" , msg <=PPTP_MSG_MAX ? pptp_msg_name[msg] : pptp_msg_name[0 ]); -/* fall through */ + fallthrough;case PPTP_START_SESSION_REQUEST :case PPTP_START_SESSION_REPLY :case PPTP_STOP_SESSION_REQUEST :
net/ipv4/nexthop.c +1 -1
@@ -1327,7 +1327,7 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb,case AF_UNSPEC :if (tb[NHA_GROUP ])break ; -/* fallthrough */ + fallthrough;default :NL_SET_ERR_MSG (extack,"Invalid address family" ); goto out;
net/ipv4/tcp.c +1 -1
@@ -2307,7 +2307,7 @@ void tcp_set_state(struct sock *sk, int state)if (inet_csk (sk)->icsk_bind_hash && !(sk->sk_userlocks &SOCK_BINDPORT_LOCK ))inet_put_port (sk); -/* fall through */ + fallthrough;default :if (oldstate ==TCP_ESTABLISHED )TCP_DEC_STATS (sock_net (sk),TCP_MIB_CURRESTAB );
net/ipv4/tcp_input.c +3 -3
@@ -2865,7 +2865,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, (*ack_flag & FLAG_LOST_RETRANS)))return ;/* Change state if cwnd is undone or retransmits are lost */ -/* fall through */ + fallthrough;default :if (tcp_is_reno (tp)) {if (flag &FLAG_SND_UNA_ADVANCED )
@@ -6367,7 +6367,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)mptcp_incoming_options (sk, skb, &tp->rx_opt);break ; } -/* fall through */ + fallthrough;case TCP_FIN_WAIT1 :case TCP_FIN_WAIT2 :/* RFC 793 says to queue data in these states,
@@ -6382,7 +6382,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)return 1 ; } } -/* Fall through */ + fallthrough;case TCP_ESTABLISHED :tcp_data_queue (sk, skb); queued =1 ;
net/ipv4/tcp_ipv4.c +2 -2
@@ -2072,7 +2072,7 @@ int tcp_v4_rcv(struct sk_buff *skb) } }/* to ACK */ -/* fall through */ + fallthrough;case TCP_TW_ACK :tcp_v4_timewait_ack (sk, skb);break ;
@@ -2368,7 +2368,7 @@ static void *tcp_seek_last_pos(struct seq_file *seq)break ; st->bucket =0 ; st->state =TCP_SEQ_STATE_ESTABLISHED ; -/* Fallthrough */ + fallthrough;case TCP_SEQ_STATE_ESTABLISHED :if (st->bucket > tcp_hashinfo.ehash_mask)break ;
net/ipv4/udp.c +1 -1
@@ -2563,7 +2563,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,case UDP_ENCAP_ESPINUDP_NON_IKE : up->encap_rcv = xfrm4_udp_encap_rcv;#endif -/* FALLTHROUGH */ + fallthrough;case UDP_ENCAP_L2TPINUDP : up->encap_type = val;lock_sock (sk);
net/ipv6/addrconf.c +2 -4
@@ -3301,7 +3301,7 @@ static void addrconf_addr_gen(struct inet6_dev *idev, bool prefix_route)switch (idev->cnf.addr_gen_mode) {case IN6_ADDR_GEN_MODE_RANDOM :ipv6_gen_mode_random_init (idev); -/* fallthrough */ + fallthrough;case IN6_ADDR_GEN_MODE_STABLE_PRIVACY :if (!ipv6_generate_stable_address (&addr,0 , idev)) addrconf_add_linklocal(idev, &addr,
@@ -3523,9 +3523,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,break ; run_pending =1 ; - -/* fall through */ - + fallthrough;case NETDEV_UP :case NETDEV_CHANGE :if (dev->flags &IFF_SLAVE )
net/ipv6/ah6.c +1 -1
@@ -259,7 +259,7 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir)case NEXTHDR_DEST :if (dir ==XFRM_POLICY_OUT )ipv6_rearrange_destopt (iph, exthdr.opth); -/* fall through */ + fallthrough;case NEXTHDR_HOP :if (!zero_out_mutable_opts (exthdr.opth)) { net_dbg_ratelimited("overrun %sopts\n",
net/ipv6/exthdrs.c +1 -1
@@ -97,7 +97,7 @@ static bool ip6_tlvopt_unknown(struct sk_buff *skb, int optoff,*/ if (ipv6_addr_is_multicast (&ipv6_hdr (skb)->daddr))break ; -/* fall through */ + fallthrough;case 2 :/* send ICMP PARM PROB regardless and drop packet */ icmpv6_param_prob (skb,ICMPV6_UNK_OPTION , optoff);return false;
net/ipv6/icmp.c +1 -1
@@ -898,7 +898,7 @@ static int icmpv6_rcv(struct sk_buff *skb) hdr =icmp6_hdr (skb);/* to notify */ -/* fall through */ + fallthrough;case ICMPV6_DEST_UNREACH :case ICMPV6_TIME_EXCEED :case ICMPV6_PARAMPROB :
net/ipv6/ip6_fib.c +4 -4
@@ -2068,8 +2068,8 @@ static int fib6_walk_continue(struct fib6_walker *w) continue; } w->state =FWS_L ; + fallthrough;#endif -/* fall through */ case FWS_L : left =rcu_dereference_protected (fn->left,1 );if (left) {
@@ -2078,7 +2078,7 @@ static int fib6_walk_continue(struct fib6_walker *w)continue ; } w->state =FWS_R ; -/* fall through */ + fallthrough;case FWS_R : right =rcu_dereference_protected (fn->right,1 );if (right) {
@@ -2088,7 +2088,7 @@ static int fib6_walk_continue(struct fib6_walker *w) } w->state =FWS_C ; w->leaf =rcu_dereference_protected (fn->leaf,1 ); -/* fall through */ + fallthrough;case FWS_C :if (w->leaf && fn->fn_flags &RTN_RTINFO ) {int err;
@@ -2107,7 +2107,7 @@ static int fib6_walk_continue(struct fib6_walker *w) } skip: w->state =FWS_U ; -/* fall through */ + fallthrough;case FWS_U :if (fn == w->root)return 0 ;
net/ipv6/ip6mr.c +1 -1
@@ -1691,7 +1691,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unscase MRT6_ADD_MFC :case MRT6_DEL_MFC : parent =-1 ; -/* fall through */ + fallthrough;case MRT6_ADD_MFC_PROXY :case MRT6_DEL_MFC_PROXY :if (optlen <sizeof (mfc))
net/ipv6/ndisc.c +1 -1
@@ -1782,7 +1782,7 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,case NETDEV_CHANGEADDR :neigh_changeaddr (&nd_tbl, dev);fib6_run_gc (0 , net, false); -/* fallthrough */ + fallthrough;case NETDEV_UP : idev =in6_dev_get (dev);if (!idev)
net/ipv6/netfilter/nf_log_ipv6.c +1 -1
@@ -248,7 +248,7 @@ static void dump_ipv6_packet(struct net *net, struct nf_log_buf *m,/* Max length: 17 "POINTER=ffffffff " */ nf_log_buf_add (m,"POINTER=%08x " ,ntohl (ic->icmp6_pointer)); -/* Fall through */ + fallthrough;case ICMPV6_DEST_UNREACH :case ICMPV6_PKT_TOOBIG :case ICMPV6_TIME_EXCEED :
net/ipv6/raw.c +4 -4
@@ -1076,7 +1076,7 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return ipv6_setsockopt (sk, level, optname, optval, optlen); }
@@ -1099,7 +1099,7 @@ static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return compat_ipv6_setsockopt (sk, level, optname, optval, optlen);
@@ -1161,7 +1161,7 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return ipv6_getsockopt (sk, level, optname, optval, optlen); }
@@ -1184,7 +1184,7 @@ static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return compat_ipv6_getsockopt (sk, level, optname, optval, optlen);
net/ipv6/route.c +1 -1
@@ -4370,7 +4370,7 @@ static int ip6_pkt_drop(struct sk_buff *skb, u8 code, int ipstats_mib_noroutes)IP6_INC_STATS (net, idev,IPSTATS_MIB_INADDRERRORS );break ; } -/* FALLTHROUGH */ + fallthrough;case IPSTATS_MIB_OUTNOROUTES :IP6_INC_STATS (net, idev, ipstats_mib_noroutes);break ;
net/ipv6/tcp_ipv6.c +1 -1
@@ -1742,7 +1742,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) } }/* to ACK */ -/* fall through */ + fallthrough;case TCP_TW_ACK :tcp_v6_timewait_ack (sk, skb);break ;
Signature · 1 line
2.24.0
David Miller
maintainerRe: [PATCH 2/3] net: [IPv4/IPv6]: Use fallthrough;
The appropriate subject prefix here would be simply "inet: " or similar.
Please resubmit this with a proper Subject line.
Thank you.
PATCH 3/3 virt: vbox: Use fallthrough;
In reply to Joe PerchesConvert the various uses of fallthrough comments to fallthrough;
Done via script
And by hand:
drivers/virt/vboxguest/vboxguest_core.c has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
--- drivers/virt/vboxguest/vboxguest_core.c | 2 +- drivers/virt/vboxguest/vboxguest_utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/virt/vboxguest/vboxguest_core.c +1 -1
@@ -1553,8 +1553,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data)#ifdef CONFIG_COMPAT case VBG_IOCTL_HGCM_CALL_32 (0 ): f32bit = true; + fallthrough;#endif -/* Fall through */ case VBG_IOCTL_HGCM_CALL (0 ):return vbg_ioctl_hgcm_call (gdev, session, f32bit, data);case VBG_IOCTL_LOG (0 ):
drivers/virt/vboxguest/vboxguest_utils.c +1 -1
@@ -311,7 +311,7 @@ static u32 hgcm_call_linear_addr_type_to_pagelist_flags(switch (type) {default :WARN_ON (1 ); -/* Fall through */ + fallthrough;case VMMDEV_HGCM_PARM_TYPE_LINADDR :case VMMDEV_HGCM_PARM_TYPE_LINADDR_KERNEL :return VMMDEV_HGCM_F_PARM_DIRECTION_BOTH ;
Signature · 1 line
2.24.0
Re: [PATCH 3/3] virt: vbox: Use fallthrough;
Hi,
Quoted 5 lines · Joe Perches
Convert the various uses of fallthrough comments to fallthrough;
Done via script
Quoted 8 lines
And by hand:
drivers/virt/vboxguest/vboxguest_core.chas a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
Patch looks good to me:
Acked-by Hans de Goede <[email protected]>
Regards,
Hans
Quoted 33 lines
--- drivers/virt/vboxguest/vboxguest_core.c | 2 +- drivers/virt/vboxguest/vboxguest_utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/virt/vboxguest/vboxguest_core.c +1
-1@@ -1553,8 +1553,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data)#ifdef CONFIG_COMPAT case VBG_IOCTL_HGCM_CALL_32 (0 ): f32bit = true; + fallthrough;#endif -/* Fall through */ case VBG_IOCTL_HGCM_CALL (0 ):return vbg_ioctl_hgcm_call (gdev, session, f32bit, data);case VBG_IOCTL_LOG (0 ):drivers/virt/vboxguest/vboxguest_utils.c +1
-1@@ -311,7 +311,7 @@ static u32 hgcm_call_linear_addr_type_to_pagelist_flags(switch (type) {default :WARN_ON (1 ); -/* Fall through */ + fallthrough;case VMMDEV_HGCM_PARM_TYPE_LINADDR :case VMMDEV_HGCM_PARM_TYPE_LINADDR_KERNEL :return VMMDEV_HGCM_F_PARM_DIRECTION_BOTH ;
PATCH v2 2/3 inet: Use fallthrough;
In reply to Joe PerchesConvert the various uses of fallthrough comments to fallthrough;
Done via script
And by hand:
net/ipv6/ip6_fib.c has a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.
So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
---
v2: Subject change
net/ipv4/af_inet.c | 4 ++-- net/ipv4/ah4.c | 2 +- net/ipv4/arp.c | 2 +- net/ipv4/devinet.c | 6 +++--- net/ipv4/fib_semantics.c | 4 ++-- net/ipv4/icmp.c | 2 +- net/ipv4/ip_output.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_log_ipv4.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 4 ++-- net/ipv4/nexthop.c | 2 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 6 +++--- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 6 ++---- net/ipv6/ah6.c | 2 +- net/ipv6/exthdrs.c | 2 +- net/ipv6/icmp.c | 2 +- net/ipv6/ip6_fib.c | 8 ++++---- net/ipv6/ip6mr.c | 2 +- net/ipv6/ndisc.c | 2 +- net/ipv6/netfilter/nf_log_ipv6.c | 2 +- net/ipv6/raw.c | 8 ++++---- net/ipv6/route.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- 26 files changed, 41 insertions(+), 43 deletions(-)
net/ipv4/af_inet.c +2 -2
@@ -872,7 +872,7 @@ int inet_shutdown(struct socket *sock, int how) err = -ENOTCONN ;/* Hack to wake up other listeners, who can poll for EPOLLHUP, even on eg. unconnected UDP sockets -- RR */ -/* fall through */ + fallthrough;default : sk->sk_shutdown |= how;if (sk->sk_prot->shutdown)
@@ -886,7 +886,7 @@ int inet_shutdown(struct socket *sock, int how)case TCP_LISTEN :if (!(how &RCV_SHUTDOWN ))break ; -/* fall through */ + fallthrough;case TCP_SYN_SENT : err = sk->sk_prot->disconnect (sk,O_NONBLOCK ); sock->state = err ?SS_DISCONNECTING :SS_UNCONNECTED ;
net/ipv4/ah4.c +1 -1
@@ -107,7 +107,7 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)if (optlen <6 )return -EINVAL ;memcpy (daddr, optptr+optlen-4 ,4 ); -/* Fall through */ + fallthrough;default :memset (optptr,0 , optlen); }
net/ipv4/arp.c +1 -1
@@ -1181,7 +1181,7 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)case SIOCSARP :if (!ns_capable (net->user_ns,CAP_NET_ADMIN ))return -EPERM ; -/* fall through */ + fallthrough;case SIOCGARP : err =copy_from_user (&r, arg,sizeof (struct arpreq ));if (err)
net/ipv4/devinet.c +3 -3
@@ -1566,11 +1566,11 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, } }ip_mc_up (in_dev); -/* fall through */ + fallthrough;case NETDEV_CHANGEADDR :if (!IN_DEV_ARP_NOTIFY (in_dev))break ; -/* fall through */ + fallthrough;case NETDEV_NOTIFY_PEERS :/* Send gratuitous ARP to notify of link change */ inetdev_send_gratuitous_arp (dev, in_dev);
@@ -1588,7 +1588,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,if (inetdev_valid_mtu (dev->mtu))break ;/* disable IP when MTU is not enough */ -/* fall through */ + fallthrough;case NETDEV_UNREGISTER :inetdev_destroy (in_dev);break ;
net/ipv4/fib_semantics.c +2 -2
@@ -1962,7 +1962,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)case NETDEV_DOWN :case NETDEV_UNREGISTER : nexthop_nh->fib_nh_flags |=RTNH_F_DEAD ; -/* fall through */ + fallthrough;case NETDEV_CHANGE : nexthop_nh->fib_nh_flags |=RTNH_F_LINKDOWN ;break ;
@@ -1984,7 +1984,7 @@ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force)case NETDEV_DOWN :case NETDEV_UNREGISTER : fi->fib_flags |=RTNH_F_DEAD ; -/* fall through */ + fallthrough;case NETDEV_CHANGE : fi->fib_flags |=RTNH_F_LINKDOWN ;break ;
net/ipv4/icmp.c +1 -1
@@ -865,7 +865,7 @@ static bool icmp_unreach(struct sk_buff *skb)case 3 :if (!icmp_tag_validation (iph->protocol)) goto out; -/* fall through */ + fallthrough;case 0 : info =ntohs (icmph->un.frag.mtu); }
net/ipv4/ip_output.c +1 -1
@@ -333,7 +333,7 @@ static int ip_mc_finish_output(struct net *net, struct sock *sk,switch (ret) {case NET_XMIT_CN : do_cn = true; -/* fall through */ + fallthrough;case NET_XMIT_SUCCESS :break ;default :
net/ipv4/ipmr.c +1 -1
@@ -1465,7 +1465,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,case MRT_ADD_MFC :case MRT_DEL_MFC : parent =-1 ; -/* fall through */ + fallthrough;case MRT_ADD_MFC_PROXY :case MRT_DEL_MFC_PROXY :if (optlen !=sizeof (mfc)) {
net/ipv4/netfilter/nf_log_ipv4.c +1 -1
@@ -173,7 +173,7 @@ static void dump_ipv4_packet(struct net *net, struct nf_log_buf *m,case ICMP_REDIRECT :/* Max length: 24 "GATEWAY=255.255.255.255 " */ nf_log_buf_add (m,"GATEWAY=%pI4 " , &ich->un.gateway); -/* Fall through */ + fallthrough;case ICMP_DEST_UNREACH :case ICMP_SOURCE_QUENCH :case ICMP_TIME_EXCEEDED :
net/ipv4/netfilter/nf_nat_pptp.c +2 -2
@@ -168,7 +168,7 @@ pptp_outbound_pkt(struct sk_buff *skb,pr_debug ("unknown outbound packet 0x%04x:%s\n" , msg, msg <=PPTP_MSG_MAX ? pptp_msg_name[msg] : pptp_msg_name[0 ]); -/* fall through */ + fallthrough;case PPTP_SET_LINK_INFO :/* only need to NAT in case PAC is behind NAT box */ case PPTP_START_SESSION_REQUEST :
@@ -271,7 +271,7 @@ pptp_inbound_pkt(struct sk_buff *skb,pr_debug ("unknown inbound packet %s\n" , msg <=PPTP_MSG_MAX ? pptp_msg_name[msg] : pptp_msg_name[0 ]); -/* fall through */ + fallthrough;case PPTP_START_SESSION_REQUEST :case PPTP_START_SESSION_REPLY :case PPTP_STOP_SESSION_REQUEST :
net/ipv4/nexthop.c +1 -1
@@ -1327,7 +1327,7 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb,case AF_UNSPEC :if (tb[NHA_GROUP ])break ; -/* fallthrough */ + fallthrough;default :NL_SET_ERR_MSG (extack,"Invalid address family" ); goto out;
net/ipv4/tcp.c +1 -1
@@ -2307,7 +2307,7 @@ void tcp_set_state(struct sock *sk, int state)if (inet_csk (sk)->icsk_bind_hash && !(sk->sk_userlocks &SOCK_BINDPORT_LOCK ))inet_put_port (sk); -/* fall through */ + fallthrough;default :if (oldstate ==TCP_ESTABLISHED )TCP_DEC_STATS (sock_net (sk),TCP_MIB_CURRESTAB );
net/ipv4/tcp_input.c +3 -3
@@ -2865,7 +2865,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una, (*ack_flag & FLAG_LOST_RETRANS)))return ;/* Change state if cwnd is undone or retransmits are lost */ -/* fall through */ + fallthrough;default :if (tcp_is_reno (tp)) {if (flag &FLAG_SND_UNA_ADVANCED )
@@ -6367,7 +6367,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)mptcp_incoming_options (sk, skb, &tp->rx_opt);break ; } -/* fall through */ + fallthrough;case TCP_FIN_WAIT1 :case TCP_FIN_WAIT2 :/* RFC 793 says to queue data in these states,
@@ -6382,7 +6382,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)return 1 ; } } -/* Fall through */ + fallthrough;case TCP_ESTABLISHED :tcp_data_queue (sk, skb); queued =1 ;
net/ipv4/tcp_ipv4.c +2 -2
@@ -2072,7 +2072,7 @@ int tcp_v4_rcv(struct sk_buff *skb) } }/* to ACK */ -/* fall through */ + fallthrough;case TCP_TW_ACK :tcp_v4_timewait_ack (sk, skb);break ;
@@ -2368,7 +2368,7 @@ static void *tcp_seek_last_pos(struct seq_file *seq)break ; st->bucket =0 ; st->state =TCP_SEQ_STATE_ESTABLISHED ; -/* Fallthrough */ + fallthrough;case TCP_SEQ_STATE_ESTABLISHED :if (st->bucket > tcp_hashinfo.ehash_mask)break ;
net/ipv4/udp.c +1 -1
@@ -2563,7 +2563,7 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,case UDP_ENCAP_ESPINUDP_NON_IKE : up->encap_rcv = xfrm4_udp_encap_rcv;#endif -/* FALLTHROUGH */ + fallthrough;case UDP_ENCAP_L2TPINUDP : up->encap_type = val;lock_sock (sk);
net/ipv6/addrconf.c +2 -4
@@ -3301,7 +3301,7 @@ static void addrconf_addr_gen(struct inet6_dev *idev, bool prefix_route)switch (idev->cnf.addr_gen_mode) {case IN6_ADDR_GEN_MODE_RANDOM :ipv6_gen_mode_random_init (idev); -/* fallthrough */ + fallthrough;case IN6_ADDR_GEN_MODE_STABLE_PRIVACY :if (!ipv6_generate_stable_address (&addr,0 , idev)) addrconf_add_linklocal(idev, &addr,
@@ -3523,9 +3523,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,break ; run_pending =1 ; - -/* fall through */ - + fallthrough;case NETDEV_UP :case NETDEV_CHANGE :if (dev->flags &IFF_SLAVE )
net/ipv6/ah6.c +1 -1
@@ -259,7 +259,7 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir)case NEXTHDR_DEST :if (dir ==XFRM_POLICY_OUT )ipv6_rearrange_destopt (iph, exthdr.opth); -/* fall through */ + fallthrough;case NEXTHDR_HOP :if (!zero_out_mutable_opts (exthdr.opth)) { net_dbg_ratelimited("overrun %sopts\n",
net/ipv6/exthdrs.c +1 -1
@@ -97,7 +97,7 @@ static bool ip6_tlvopt_unknown(struct sk_buff *skb, int optoff,*/ if (ipv6_addr_is_multicast (&ipv6_hdr (skb)->daddr))break ; -/* fall through */ + fallthrough;case 2 :/* send ICMP PARM PROB regardless and drop packet */ icmpv6_param_prob (skb,ICMPV6_UNK_OPTION , optoff);return false;
net/ipv6/icmp.c +1 -1
@@ -898,7 +898,7 @@ static int icmpv6_rcv(struct sk_buff *skb) hdr =icmp6_hdr (skb);/* to notify */ -/* fall through */ + fallthrough;case ICMPV6_DEST_UNREACH :case ICMPV6_TIME_EXCEED :case ICMPV6_PARAMPROB :
net/ipv6/ip6_fib.c +4 -4
@@ -2068,8 +2068,8 @@ static int fib6_walk_continue(struct fib6_walker *w) continue; } w->state =FWS_L ; + fallthrough;#endif -/* fall through */ case FWS_L : left =rcu_dereference_protected (fn->left,1 );if (left) {
@@ -2078,7 +2078,7 @@ static int fib6_walk_continue(struct fib6_walker *w)continue ; } w->state =FWS_R ; -/* fall through */ + fallthrough;case FWS_R : right =rcu_dereference_protected (fn->right,1 );if (right) {
@@ -2088,7 +2088,7 @@ static int fib6_walk_continue(struct fib6_walker *w) } w->state =FWS_C ; w->leaf =rcu_dereference_protected (fn->leaf,1 ); -/* fall through */ + fallthrough;case FWS_C :if (w->leaf && fn->fn_flags &RTN_RTINFO ) {int err;
@@ -2107,7 +2107,7 @@ static int fib6_walk_continue(struct fib6_walker *w) } skip: w->state =FWS_U ; -/* fall through */ + fallthrough;case FWS_U :if (fn == w->root)return 0 ;
net/ipv6/ip6mr.c +1 -1
@@ -1691,7 +1691,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unscase MRT6_ADD_MFC :case MRT6_DEL_MFC : parent =-1 ; -/* fall through */ + fallthrough;case MRT6_ADD_MFC_PROXY :case MRT6_DEL_MFC_PROXY :if (optlen <sizeof (mfc))
net/ipv6/ndisc.c +1 -1
@@ -1782,7 +1782,7 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,case NETDEV_CHANGEADDR :neigh_changeaddr (&nd_tbl, dev);fib6_run_gc (0 , net, false); -/* fallthrough */ + fallthrough;case NETDEV_UP : idev =in6_dev_get (dev);if (!idev)
net/ipv6/netfilter/nf_log_ipv6.c +1 -1
@@ -248,7 +248,7 @@ static void dump_ipv6_packet(struct net *net, struct nf_log_buf *m,/* Max length: 17 "POINTER=ffffffff " */ nf_log_buf_add (m,"POINTER=%08x " ,ntohl (ic->icmp6_pointer)); -/* Fall through */ + fallthrough;case ICMPV6_DEST_UNREACH :case ICMPV6_PKT_TOOBIG :case ICMPV6_TIME_EXCEED :
net/ipv6/raw.c +4 -4
@@ -1076,7 +1076,7 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return ipv6_setsockopt (sk, level, optname, optval, optlen); }
@@ -1099,7 +1099,7 @@ static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return compat_ipv6_setsockopt (sk, level, optname, optval, optlen);
@@ -1161,7 +1161,7 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return ipv6_getsockopt (sk, level, optname, optval, optlen); }
@@ -1184,7 +1184,7 @@ static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,if (optname ==IPV6_CHECKSUM || optname ==IPV6_HDRINCL )break ; -/* fall through */ + fallthrough;default :return compat_ipv6_getsockopt (sk, level, optname, optval, optlen);
net/ipv6/route.c +1 -1
@@ -4370,7 +4370,7 @@ static int ip6_pkt_drop(struct sk_buff *skb, u8 code, int ipstats_mib_noroutes)IP6_INC_STATS (net, idev,IPSTATS_MIB_INADDRERRORS );break ; } -/* FALLTHROUGH */ + fallthrough;case IPSTATS_MIB_OUTNOROUTES :IP6_INC_STATS (net, idev, ipstats_mib_noroutes);break ;
net/ipv6/tcp_ipv6.c +1 -1
@@ -1742,7 +1742,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) } }/* to ACK */ -/* fall through */ + fallthrough;case TCP_TW_ACK :tcp_v6_timewait_ack (sk, skb);break ;
Re: [PATCH 2/3 V2] inet: Use fallthrough;
From: Joe Perches <[email protected]>
Date: Thu, 12 Mar 2020 15:50:22 -0700
Quoted 5 lines
Convert the various uses of fallthrough comments to fallthrough;
Done via script
Quoted 8 lines
And by hand:
net/ipv6/ip6_fib.chas a fallthrough comment outside of an #ifdef block that causes gcc to emit a warning if converted in-place.So move the new fallthrough; inside the containing #ifdef/#endif too.
Signed-off-by Joe Perches <[email protected]>
Applied to net-next.