[RESEND,next] rds: Fix fall-through warnings for Clang

Message ID 20210305090612.GA139288@embeddedor
State New
Headers show
Series
  • [RESEND,next] rds: Fix fall-through warnings for Clang
Related show

Commit Message

Gustavo A. R. Silva March 5, 2021, 9:06 a.m.
In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple
warnings by explicitly adding multiple break statements instead of
letting the code fall through to the next case.

Link: https://github.com/KSPP/linux/issues/115
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
 net/rds/tcp_connect.c | 1 +
 net/rds/threads.c     | 2 ++
 2 files changed, 3 insertions(+)

Comments

Gustavo A. R. Silva April 20, 2021, 8:10 p.m. | #1
Hi all,

Friendly ping: who can take this, please?

Thanks
--
Gustavo

On 3/5/21 03:06, Gustavo A. R. Silva wrote:
> In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple

> warnings by explicitly adding multiple break statements instead of

> letting the code fall through to the next case.

> 

> Link: https://github.com/KSPP/linux/issues/115

> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>

> ---

>  net/rds/tcp_connect.c | 1 +

>  net/rds/threads.c     | 2 ++

>  2 files changed, 3 insertions(+)

> 

> diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c

> index 4e64598176b0..5461d77fff4f 100644

> --- a/net/rds/tcp_connect.c

> +++ b/net/rds/tcp_connect.c

> @@ -78,6 +78,7 @@ void rds_tcp_state_change(struct sock *sk)

>  	case TCP_CLOSE_WAIT:

>  	case TCP_CLOSE:

>  		rds_conn_path_drop(cp, false);

> +		break;

>  	default:

>  		break;

>  	}

> diff --git a/net/rds/threads.c b/net/rds/threads.c

> index 32dc50f0a303..1f424cbfcbb4 100644

> --- a/net/rds/threads.c

> +++ b/net/rds/threads.c

> @@ -208,6 +208,7 @@ void rds_send_worker(struct work_struct *work)

>  		case -ENOMEM:

>  			rds_stats_inc(s_send_delayed_retry);

>  			queue_delayed_work(rds_wq, &cp->cp_send_w, 2);

> +			break;

>  		default:

>  			break;

>  		}

> @@ -232,6 +233,7 @@ void rds_recv_worker(struct work_struct *work)

>  		case -ENOMEM:

>  			rds_stats_inc(s_recv_delayed_retry);

>  			queue_delayed_work(rds_wq, &cp->cp_recv_w, 2);

> +			break;

>  		default:

>  			break;

>  		}

>
Haakon Bugge May 6, 2021, 6:50 a.m. | #2
Sorry for the delay.


> On 20 Apr 2021, at 22:10, Gustavo A. R. Silva <gustavo@embeddedor.com> wrote:

> 

> Hi all,

> 

> Friendly ping: who can take this, please?

> 

> Thanks

> --

> Gustavo

> 

> On 3/5/21 03:06, Gustavo A. R. Silva wrote:

>> In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple

>> warnings by explicitly adding multiple break statements instead of

>> letting the code fall through to the next case.

>> 

>> Link: https://github.com/KSPP/linux/issues/115

>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>


Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>



Thxs, Håkon


>> ---

>> net/rds/tcp_connect.c | 1 +

>> net/rds/threads.c     | 2 ++

>> 2 files changed, 3 insertions(+)

>> 

>> diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c

>> index 4e64598176b0..5461d77fff4f 100644

>> --- a/net/rds/tcp_connect.c

>> +++ b/net/rds/tcp_connect.c

>> @@ -78,6 +78,7 @@ void rds_tcp_state_change(struct sock *sk)

>> 	case TCP_CLOSE_WAIT:

>> 	case TCP_CLOSE:

>> 		rds_conn_path_drop(cp, false);

>> +		break;

>> 	default:

>> 		break;

>> 	}

>> diff --git a/net/rds/threads.c b/net/rds/threads.c

>> index 32dc50f0a303..1f424cbfcbb4 100644

>> --- a/net/rds/threads.c

>> +++ b/net/rds/threads.c

>> @@ -208,6 +208,7 @@ void rds_send_worker(struct work_struct *work)

>> 		case -ENOMEM:

>> 			rds_stats_inc(s_send_delayed_retry);

>> 			queue_delayed_work(rds_wq, &cp->cp_send_w, 2);

>> +			break;

>> 		default:

>> 			break;

>> 		}

>> @@ -232,6 +233,7 @@ void rds_recv_worker(struct work_struct *work)

>> 		case -ENOMEM:

>> 			rds_stats_inc(s_recv_delayed_retry);

>> 			queue_delayed_work(rds_wq, &cp->cp_recv_w, 2);

>> +			break;

>> 		default:

>> 			break;

>> 		}

>>
Gustavo A. R. Silva May 18, 2021, 1:01 a.m. | #3
Hi all,

If you don't mind, I'm taking this in my -next[1] branch for v5.14.

Thanks
--
Gustavo

[1] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/log/?h=for-next/kspp

On 5/6/21 01:50, Haakon Bugge wrote:
> Sorry for the delay.

> 

> 

>> On 20 Apr 2021, at 22:10, Gustavo A. R. Silva <gustavo@embeddedor.com> wrote:

>>

>> Hi all,

>>

>> Friendly ping: who can take this, please?

>>

>> Thanks

>> --

>> Gustavo

>>

>> On 3/5/21 03:06, Gustavo A. R. Silva wrote:

>>> In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple

>>> warnings by explicitly adding multiple break statements instead of

>>> letting the code fall through to the next case.

>>>

>>> Link: https://github.com/KSPP/linux/issues/115

>>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>

> 

> Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>

> 

> 

> Thxs, Håkon

> 

> 

>>> ---

>>> net/rds/tcp_connect.c | 1 +

>>> net/rds/threads.c     | 2 ++

>>> 2 files changed, 3 insertions(+)

>>>

>>> diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c

>>> index 4e64598176b0..5461d77fff4f 100644

>>> --- a/net/rds/tcp_connect.c

>>> +++ b/net/rds/tcp_connect.c

>>> @@ -78,6 +78,7 @@ void rds_tcp_state_change(struct sock *sk)

>>> 	case TCP_CLOSE_WAIT:

>>> 	case TCP_CLOSE:

>>> 		rds_conn_path_drop(cp, false);

>>> +		break;

>>> 	default:

>>> 		break;

>>> 	}

>>> diff --git a/net/rds/threads.c b/net/rds/threads.c

>>> index 32dc50f0a303..1f424cbfcbb4 100644

>>> --- a/net/rds/threads.c

>>> +++ b/net/rds/threads.c

>>> @@ -208,6 +208,7 @@ void rds_send_worker(struct work_struct *work)

>>> 		case -ENOMEM:

>>> 			rds_stats_inc(s_send_delayed_retry);

>>> 			queue_delayed_work(rds_wq, &cp->cp_send_w, 2);

>>> +			break;

>>> 		default:

>>> 			break;

>>> 		}

>>> @@ -232,6 +233,7 @@ void rds_recv_worker(struct work_struct *work)

>>> 		case -ENOMEM:

>>> 			rds_stats_inc(s_recv_delayed_retry);

>>> 			queue_delayed_work(rds_wq, &cp->cp_recv_w, 2);

>>> +			break;

>>> 		default:

>>> 			break;

>>> 		}

>>>

>

Patch

diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index 4e64598176b0..5461d77fff4f 100644
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -78,6 +78,7 @@  void rds_tcp_state_change(struct sock *sk)
 	case TCP_CLOSE_WAIT:
 	case TCP_CLOSE:
 		rds_conn_path_drop(cp, false);
+		break;
 	default:
 		break;
 	}
diff --git a/net/rds/threads.c b/net/rds/threads.c
index 32dc50f0a303..1f424cbfcbb4 100644
--- a/net/rds/threads.c
+++ b/net/rds/threads.c
@@ -208,6 +208,7 @@  void rds_send_worker(struct work_struct *work)
 		case -ENOMEM:
 			rds_stats_inc(s_send_delayed_retry);
 			queue_delayed_work(rds_wq, &cp->cp_send_w, 2);
+			break;
 		default:
 			break;
 		}
@@ -232,6 +233,7 @@  void rds_recv_worker(struct work_struct *work)
 		case -ENOMEM:
 			rds_stats_inc(s_recv_delayed_retry);
 			queue_delayed_work(rds_wq, &cp->cp_recv_w, 2);
+			break;
 		default:
 			break;
 		}