Subject: [merged] ocfs2-adjust-switch_case-syntax-at-o2net_state_change.patch removed from -mm tree
To: jeff.liu@xxxxxxxxxx,gurudas.pai@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,n_iwamatsu@xxxxxxxxxxxxxx,srinivas.eeda@xxxxxxxxxx,sunil.mushran@xxxxxxxxx,tm@xxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 08 Jul 2013 12:23:35 -0700
The patch titled
Subject: ocfs2: adjust switch_case syntax at o2net_state_change()
has been removed from the -mm tree. Its filename was
ocfs2-adjust-switch_case-syntax-at-o2net_state_change.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jie Liu <jeff.liu@xxxxxxxxxx>
Subject: ocfs2: adjust switch_case syntax at o2net_state_change()
Adjust switch..case syntax at o2net_state_change to meet the kernel coding
standard.
s/printk/pr_info/.
[akpm@xxxxxxxxxxxxxxxxxxxx: revert pr_foo() change]
Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
Acked-by: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Noboru Iwamatsu <n_iwamatsu@xxxxxxxxxxxxxx>
Cc: Srinivas Eeeda <srinivas.eeda@xxxxxxxxxx>
Cc: Sunil Mushran <sunil.mushran@xxxxxxxxx>
Cc: Tao Ma <tm@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/cluster/tcp.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff -puN fs/ocfs2/cluster/tcp.c~ocfs2-adjust-switch_case-syntax-at-o2net_state_change fs/ocfs2/cluster/tcp.c
--- a/fs/ocfs2/cluster/tcp.c~ocfs2-adjust-switch_case-syntax-at-o2net_state_change
+++ a/fs/ocfs2/cluster/tcp.c
@@ -633,19 +633,19 @@ static void o2net_state_change(struct so
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:
+ 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;
}
out:
read_unlock(&sk->sk_callback_lock);
_
Patches currently in -mm which might be from jeff.liu@xxxxxxxxxx are
origin.patch
linux-next.patch
ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del.patch
ocfs2-llseek-requires-ocfs2-inode-lock-for-the-file-in-seek_end.patch
ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size.patch
ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size-v2.patch
binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
