diff mbox

[RESENT,4/4] ocfs2: adjust switch_case syntax at o2net_state_change()

Message ID 51CE5C0F.8030701@oracle.com
State New, archived
Headers show

Commit Message

jeff.liu June 29, 2013, 4:01 a.m. UTC
From: Jie Liu <jeff.liu@oracle.com>

Adjust switch..case syntax at o2net_state_change to meet
the kernel coding standard.

s/printk/pr_info/.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---
 fs/ocfs2/cluster/tcp.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Comments

Joel Becker July 1, 2013, 11:04 p.m. UTC | #1
On Sat, Jun 29, 2013 at 12:01:19PM +0800, Jeff Liu wrote:
> From: Jie Liu <jeff.liu@oracle.com>
> 
> Adjust switch..case syntax at o2net_state_change to meet
> the kernel coding standard.
> 
> s/printk/pr_info/.
> 
> Signed-off-by: Jie Liu <jeff.liu@oracle.com>

	Switching to pr_info() hasn't been discussed as part of the
project.  Let's have that conversation elsewhere.

Joel

> ---
>  fs/ocfs2/cluster/tcp.c |   26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
> index aa88bd8..db4c465 100644
> --- a/fs/ocfs2/cluster/tcp.c
> +++ b/fs/ocfs2/cluster/tcp.c
> @@ -630,19 +630,19 @@ static void o2net_state_change(struct sock *sk)
>  	state_change = sc->sc_state_change;
>  
>  	switch(sk->sk_state) {
> -		/* ignore connecting sockets as they make progress */
> -		case TCP_SYN_SENT:
> -		case TCP_SYN_RECV:
> -			break;
> -		case TCP_ESTABLISHED:
> -			o2net_sc_queue_work(sc, &sc->sc_connect_work);
> -			break;
> -		default:
> -			printk(KERN_INFO "o2net: Connection to " SC_NODEF_FMT
> -			      " shutdown, state %d\n",
> -			      SC_NODEF_ARGS(sc), sk->sk_state);
> -			o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
> -			break;
> +	/* ignore connecting sockets as they make progress */
> +	case TCP_SYN_SENT:
> +	case TCP_SYN_RECV:
> +		break;
> +	case TCP_ESTABLISHED:
> +		o2net_sc_queue_work(sc, &sc->sc_connect_work);
> +		break;
> +	default:
> +		pr_info(KERN_INFO "o2net: Connection to " SC_NODEF_FMT
> +			" shutdown, state %d\n",
> +			SC_NODEF_ARGS(sc), sk->sk_state);
> +		o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
> +		break;
>  	}
>  out:
>  	read_unlock(&sk->sk_callback_lock);
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel@oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Andrew Morton July 1, 2013, 11:22 p.m. UTC | #2
On Mon, 1 Jul 2013 16:04:21 -0700 Joel Becker <jlbec@evilplan.org> wrote:

> On Sat, Jun 29, 2013 at 12:01:19PM +0800, Jeff Liu wrote:
> > From: Jie Liu <jeff.liu@oracle.com>
> > 
> > Adjust switch..case syntax at o2net_state_change to meet
> > the kernel coding standard.
> > 
> > s/printk/pr_info/.
> > 
> > Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> 
> 	Switching to pr_info() hasn't been discussed as part of the
> project.  Let's have that conversation elsewhere.
> 

I reverted that bit.

It was wrong anyway:

> > +		pr_info(KERN_INFO "o2net: Connection to " SC_NODEF_FMT
> > +			" shutdown, state %d\n",
> > +			SC_NODEF_ARGS(sc), sk->sk_state);

Should remove the "KERN_INFO " now.


Switching to pr_foo is a good idea, I find.  A nice thing about it is
that it reduces the length of the lines quite a lot, and printk
statements are often quite long lines.  The net effect is that a *lot*
of nasty make-it-fit-in-80-columns tricks just vanish.
Joel Becker July 2, 2013, 12:57 a.m. UTC | #3
On Mon, Jul 01, 2013 at 04:22:28PM -0700, Andrew Morton wrote:
> On Mon, 1 Jul 2013 16:04:21 -0700 Joel Becker <jlbec@evilplan.org> wrote:
> 
> > On Sat, Jun 29, 2013 at 12:01:19PM +0800, Jeff Liu wrote:
> > > From: Jie Liu <jeff.liu@oracle.com>
> > > 
> > > Adjust switch..case syntax at o2net_state_change to meet
> > > the kernel coding standard.
> > > 
> > > s/printk/pr_info/.
> > > 
> > > Signed-off-by: Jie Liu <jeff.liu@oracle.com>
> > 
> > 	Switching to pr_info() hasn't been discussed as part of the
> > project.  Let's have that conversation elsewhere.
> > 
> 
> I reverted that bit.
> 
> It was wrong anyway:
> 
> > > +		pr_info(KERN_INFO "o2net: Connection to " SC_NODEF_FMT
> > > +			" shutdown, state %d\n",
> > > +			SC_NODEF_ARGS(sc), sk->sk_state);
> 
> Should remove the "KERN_INFO " now.
> 
> 
> Switching to pr_foo is a good idea, I find.  A nice thing about it is
> that it reduces the length of the lines quite a lot, and printk
> statements are often quite long lines.  The net effect is that a *lot*
> of nasty make-it-fit-in-80-columns tricks just vanish.

	That's good to know.

Joel
diff mbox

Patch

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index aa88bd8..db4c465 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -630,19 +630,19 @@  static void o2net_state_change(struct sock *sk)
 	state_change = sc->sc_state_change;
 
 	switch(sk->sk_state) {
-		/* ignore connecting sockets as they make progress */
-		case TCP_SYN_SENT:
-		case TCP_SYN_RECV:
-			break;
-		case TCP_ESTABLISHED:
-			o2net_sc_queue_work(sc, &sc->sc_connect_work);
-			break;
-		default:
-			printk(KERN_INFO "o2net: Connection to " SC_NODEF_FMT
-			      " shutdown, state %d\n",
-			      SC_NODEF_ARGS(sc), sk->sk_state);
-			o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
-			break;
+	/* ignore connecting sockets as they make progress */
+	case TCP_SYN_SENT:
+	case TCP_SYN_RECV:
+		break;
+	case TCP_ESTABLISHED:
+		o2net_sc_queue_work(sc, &sc->sc_connect_work);
+		break;
+	default:
+		pr_info(KERN_INFO "o2net: Connection to " SC_NODEF_FMT
+			" shutdown, state %d\n",
+			SC_NODEF_ARGS(sc), sk->sk_state);
+		o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
+		break;
 	}
 out:
 	read_unlock(&sk->sk_callback_lock);