Merge tag 'cris-for-3.14' of git://jni.nu/cris

[linux-2.6-block.git] / fs / ocfs2 / stack_o2cb.c

diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
index bf1f8930456f145343089206ff3ec2469a532ad7..1724d43d3da1626b517b8deb73cd87c47492fd85 100644 (file)
--- a/fs/ocfs2/stack_o2cb.c
+++ b/fs/ocfs2/stack_o2cb.c
@@ -398,7 +398,8 @@ static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn)
        return 0;
 }
 
-static int o2cb_cluster_this_node(unsigned int *node)
+static int o2cb_cluster_this_node(struct ocfs2_cluster_connection *conn,
+                                 unsigned int *node)
 {
        int node_num;