|
@@ -110,6 +110,8 @@
|
|
struct ocfs2_live_connection {
|
|
struct ocfs2_live_connection {
|
|
struct list_head oc_list;
|
|
struct list_head oc_list;
|
|
struct ocfs2_cluster_connection *oc_conn;
|
|
struct ocfs2_cluster_connection *oc_conn;
|
|
|
|
+ atomic_t oc_this_node;
|
|
|
|
+ int oc_our_slot;
|
|
};
|
|
};
|
|
|
|
|
|
struct ocfs2_control_private {
|
|
struct ocfs2_control_private {
|
|
@@ -799,6 +801,42 @@ static int fs_protocol_compare(struct ocfs2_protocol_version *existing,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void user_recover_prep(void *arg)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void user_recover_slot(void *arg, struct dlm_slot *slot)
|
|
|
|
+{
|
|
|
|
+ struct ocfs2_cluster_connection *conn = arg;
|
|
|
|
+ printk(KERN_INFO "ocfs2: Node %d/%d down. Initiating recovery.\n",
|
|
|
|
+ slot->nodeid, slot->slot);
|
|
|
|
+ conn->cc_recovery_handler(slot->nodeid, conn->cc_recovery_data);
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void user_recover_done(void *arg, struct dlm_slot *slots,
|
|
|
|
+ int num_slots, int our_slot,
|
|
|
|
+ uint32_t generation)
|
|
|
|
+{
|
|
|
|
+ struct ocfs2_cluster_connection *conn = arg;
|
|
|
|
+ struct ocfs2_live_connection *lc = conn->cc_private;
|
|
|
|
+ int i;
|
|
|
|
+
|
|
|
|
+ for (i = 0; i < num_slots; i++)
|
|
|
|
+ if (slots[i].slot == our_slot) {
|
|
|
|
+ atomic_set(&lc->oc_this_node, slots[i].nodeid);
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ lc->oc_our_slot = our_slot;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+const struct dlm_lockspace_ops ocfs2_ls_ops = {
|
|
|
|
+ .recover_prep = user_recover_prep,
|
|
|
|
+ .recover_slot = user_recover_slot,
|
|
|
|
+ .recover_done = user_recover_done,
|
|
|
|
+};
|
|
|
|
+
|
|
static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
|
|
static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
|
|
{
|
|
{
|
|
dlm_lockspace_t *fsdlm;
|
|
dlm_lockspace_t *fsdlm;
|