Merge branch 'akpm' (final batch from Andrew)

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / stack_o2cb.c

diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
index 94368017edb378ce1e3961d1976408c954677c9a..bf1f8930456f145343089206ff3ec2469a532ad7 100644 (file)
--- a/fs/ocfs2/stack_o2cb.c
+++ b/fs/ocfs2/stack_o2cb.c
@@ -376,7 +376,7 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn)
        dlm_register_eviction_cb(dlm, &priv->op_eviction_cb);
 
 out_free:
-       if (rc && conn->cc_private)
+       if (rc)
                kfree(conn->cc_private);
 
 out: