Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 16 insertions, 13 deletions

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index aa88bd8bcedc..d644dc611425 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -406,6 +406,9 @@ static void sc_kref_release(struct kref *kref)
         sc->sc_node = NULL;
 
         o2net_debug_del_sc(sc);
+
+        if (sc->sc_page)
+                __free_page(sc->sc_page);
         kfree(sc);
 }
 
@@ -630,19 +633,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:
+                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);